diff --git a/src/main/java/de/thm/arsnova/services/FeedbackService.java b/src/main/java/de/thm/arsnova/services/FeedbackService.java
index 4df29c7d6f242ffb14a3d9dc6317523e054c3b14..3011fb64e95ab6bbd060f83a33e7c9055fc96509 100644
--- a/src/main/java/de/thm/arsnova/services/FeedbackService.java
+++ b/src/main/java/de/thm/arsnova/services/FeedbackService.java
@@ -98,7 +98,7 @@ public class FeedbackService implements IFeedbackService {
 		for (Map.Entry<User, Set<Session>> entry : affectedSessionsOfUsers.entrySet()) {
 			final User user = entry.getKey();
 			final Set<Session> arsSessions = entry.getValue();
-			server.reportDeletedFeedback(user.getUsername(), arsSessions);
+			server.reportDeletedFeedback(user, arsSessions);
 		}
 		// For each session that has deleted feedback, send the new feedback to all clients
 		for (Session session : deletedFeedbackOfUsersInSession.keySet()) {
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index aada6b731e4374b4238a2337613fb720f182134f..36102b499675e0945e3b607f7d53794c2067a203 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -225,8 +225,8 @@ public class ARSnovaSocketIOServer {
 		this.useSSL = useSSL;
 	}
 
-	public void reportDeletedFeedback(final String username, final Set<de.thm.arsnova.entities.Session> arsSessions) {
-		final List<UUID> connectionIds = findConnectionIdForUser(username);
+	public void reportDeletedFeedback(final User user, final Set<de.thm.arsnova.entities.Session> arsSessions) {
+		final List<UUID> connectionIds = findConnectionIdForUser(user);
 		if (connectionIds.isEmpty()) {
 			return;
 		}
@@ -244,11 +244,13 @@ public class ARSnovaSocketIOServer {
 		}
 	}
 
-	private List<UUID> findConnectionIdForUser(final String username) {
+	private List<UUID> findConnectionIdForUser(final User user) {
 		final List<UUID> result = new ArrayList<UUID>();
 		for (final Entry<UUID, User> e : userService.socketId2User()) {
-			if (e.getValue().getUsername().equals(username)) {
-				result.add(e.getKey());
+			final UUID someUsersConnectionId = e.getKey();
+			final User someUser = e.getValue();
+			if (someUser.equals(user)) {
+				result.add(someUsersConnectionId);
 			}
 		}
 		return result;
@@ -293,7 +295,7 @@ public class ARSnovaSocketIOServer {
 		} catch (final NoContentException e) {
 			averageFeedback = null;
 		}
-		final List<UUID> connectionIds = findConnectionIdForUser(user.getUsername());
+		final List<UUID> connectionIds = findConnectionIdForUser(user);
 		if (connectionIds.isEmpty()) {
 			return;
 		}