diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 550ac08621896e741233076d5d70ce1a296c8cf7..ebbe042fd6643b18b950df14d9b2b821bdceb361 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -185,7 +185,8 @@ public class UserService implements IUserService, InitializingBean, DisposableBe
 	@Override
 	@Transactional(isolation = Isolation.READ_COMMITTED)
 	public void removeUserFromSessionBySocketId(UUID socketId) {
-		user2session.remove(socketId);
+		User user = socketid2user.get(socketId);
+		user2session.remove(user);
 	}
 
 	@Override