diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 5e9f3c9b55ecf4db589baf91978e495871e25f19..84d952172fd9fd10e2e931e17d7db33716c876fc 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -191,6 +191,11 @@ public class UserService implements IUserService, InitializingBean, DisposableBe
 	@Transactional(isolation = Isolation.READ_COMMITTED)
 	public void removeUserFromSessionBySocketId(UUID socketId) {
 		User user = socketid2user.get(socketId);
+		if (null == user) {
+			LOGGER.warn("null == user for socket {}", socketId);
+
+			return;
+		}
 		user2session.remove(user);
 	}