diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 63e5858acf970f94932d8380bda096f3708662d9..0bb5b2e3742f2b53a9ee570e6e3b85bfc0866bd6 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -111,6 +111,11 @@ public class ARSnovaSocketIOServer {
 			@Override
 			public void onData(SocketIOClient client, Session session, AckRequest ackSender) {
 				User u = userService.getUser2SocketId(client.getSessionId());
+				if (null == u) {
+					LOGGER.info("Client {} requested to join session but is not mapped to a user", client.getSessionId());
+
+					return;
+				}
 				String oldSessionKey = userService.getSessionForUser(u.getUsername());
 				if (session.getKeyword() == oldSessionKey) {
 					return;