diff --git a/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
index 1921919a8a3f88c08f6dd7bd917d3ea04dcd705d..19c8de57f25617049489366cf8c42fd87be3e32c 100644
--- a/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
+++ b/src/main/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandler.java
@@ -39,7 +39,7 @@ public class FeedbackCommandHandler {
 		feedbackChanged.setPayload(feedbackChangedPayload);
 
 		messagingTemplate.convertAndSend(
-				"/queue/" + command.getRoomId() + ".feedback.stream",
+				"/topic/" + command.getRoomId() + ".feedback.stream",
 				feedbackChanged
 		);
 	}
@@ -53,7 +53,7 @@ public class FeedbackCommandHandler {
 		feedbackChanged.setPayload(feedbackChangedPayload);
 
 		messagingTemplate.convertAndSend(
-				"/queue/" + command.getRoomId() + ".feedback.stream",
+				"/topic/" + command.getRoomId() + ".feedback.stream",
 				feedbackChanged
 		);
 	}
diff --git a/src/test/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandlerTest.java b/src/test/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandlerTest.java
index 277079cc7d2e24745cd8e5f74ff0029847308859..073c586e14020ae811fc08d0e6cb6b516f96dbc2 100644
--- a/src/test/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandlerTest.java
+++ b/src/test/java/de/thm/arsnova/websocket/handler/FeedbackCommandHandlerTest.java
@@ -50,7 +50,7 @@ public class FeedbackCommandHandlerTest {
 				ArgumentCaptor.forClass(FeedbackChanged.class);
 
 		verify(messagingTemplate).convertAndSend(topicCaptor.capture(), messageCaptor.capture());
-		assertThat(topicCaptor.getValue()).isEqualTo("/queue/" + roomId + ".feedback.stream");
+		assertThat(topicCaptor.getValue()).isEqualTo("/topic/" + roomId + ".feedback.stream");
 		assertThat(messageCaptor.getValue()).isEqualTo(feedbackChanged);
 	}
 
@@ -68,7 +68,7 @@ public class FeedbackCommandHandlerTest {
 
 		ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
 		verify(messagingTemplate).convertAndSend(captor.capture(), any(FeedbackChanged.class));
-		assertThat(captor.getValue()).isEqualTo("/queue/" + roomId + ".feedback.stream");
+		assertThat(captor.getValue()).isEqualTo("/topic/" + roomId + ".feedback.stream");
 	}
 }