diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 7fbb17ae61e3f4ec1a63cd14f63cbfb53d866bed..85ebf9d79689382224f95b28c9dd838ff6d6591f 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -100,15 +100,12 @@ public class ARSnovaSocketIOServer {
 		server.addEventListener("setFeedback", Feedback.class, new DataListener<Feedback>() {
 			@Override
 			public void onData(SocketIOClient client, Feedback data, AckRequest ackSender) {
-				/**
-				 * do a check if user is in the session, for which he would give
-				 * a feedback
-				 */
 				User u = userService.getUser2SocketId(client.getSessionId());
-				if (u == null || !userService.isUserInSession(u, data.getSessionkey())) {
-					return;
+				String sessionKey = userService.getSessionForUser(u.getUsername());
+				LOGGER.debug("Feedback recieved: {}", new Object[] {u, sessionKey, data.getValue()});
+				if (null != sessionKey) {
+					feedbackService.saveFeedback(sessionKey, data.getValue(), u);
 				}
-				feedbackService.saveFeedback(data.getSessionkey(), data.getValue(), u);
 			}
 		});
 
diff --git a/src/main/java/de/thm/arsnova/socket/message/Feedback.java b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
index 8fdff90a09aec0d8945d99a793c6520b9b014831..2168e8d59574e1d3187dbf638f4bffcd19b3ccf1 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Feedback.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
@@ -3,15 +3,6 @@ package de.thm.arsnova.socket.message;
 public class Feedback {
 
 	private int value;
-	private String sessionkey;
-
-	public String getSessionkey() {
-		return sessionkey;
-	}
-
-	public void setSessionkey(String keyword) {
-		this.sessionkey = keyword;
-	}
 
 	public int getValue() {
 		return value;
@@ -23,6 +14,6 @@ public class Feedback {
 
 	@Override
 	public String toString() {
-		return "Feedback, sessionkey: " + sessionkey + ", value: " + value;
+		return "Feedback, value: " + value;
 	}
 }