diff --git a/services/web/app/src/Features/Editor/EditorRealTimeController.js b/services/web/app/src/Features/Editor/EditorRealTimeController.js
index 39317c31ce..ae9b8d2750 100644
--- a/services/web/app/src/Features/Editor/EditorRealTimeController.js
+++ b/services/web/app/src/Features/Editor/EditorRealTimeController.js
@@ -26,8 +26,14 @@ module.exports = EditorRealTimeController = {
   emitToRoom(room_id, message, ...payload) {
     // create a unique message id using a counter
     const message_id = `web:${HOST}:${RND}-${COUNT++}`
+    var channel
+    if (room_id === 'all' || !Settings.publishOnIndividualChannels) {
+      channel = 'editor-events'
+    } else {
+      channel = `editor-events:${room_id}`
+    }
     return rclient.publish(
-      'editor-events',
+      channel,
       JSON.stringify({
         room_id,
         message,