diff --git a/client/src/app/gateways/notify.service.ts b/client/src/app/gateways/notify.service.ts
index 3313464af5..b5a236c9cd 100644
--- a/client/src/app/gateways/notify.service.ts
+++ b/client/src/app/gateways/notify.service.ts
@@ -30,7 +30,6 @@ interface NotifyBase<T> {
  */
 export interface NotifyRequest<T> extends NotifyBase<T> {
     channel_id: string;
-    to_all?: boolean;
 
     /**
      * Targeted Meeting as MeetingID
@@ -83,7 +82,7 @@ interface ChannelIdResponse {
 interface NotifySendOptions<T> {
     name: string;
     message: T;
-    toAll?: boolean;
+    meeting?: number;
     users?: number[];
     channels?: string[];
 }
@@ -145,12 +144,17 @@ export class NotifyService extends BaseICCGatewayService<ChannelIdResponse | Not
     }
 
     /**
-     * Sents a notify message to all users (so all clients that are online).
+     * Sents a notify message to all users of a meeting.
      * @param name The name of the notify message
      * @param content The payload to send
-     */
-    public async sendToAllUsers<T>(name: string, content: T): Promise<void> {
-        await this.send(this.buildRequest({ name, message: content, toAll: true }));
+     * @param meetingId The meeting id to send this message to
+     */
+    public async sendToMeeting<T>(
+        name: string,
+        content: T,
+        meetingId: number = this.activeMeetingIdService.meetingId
+    ): Promise<void> {
+        await this.send(this.buildRequest({ name, message: content, meeting: meetingId }));
     }
 
     /**
@@ -197,8 +201,8 @@ export class NotifyService extends BaseICCGatewayService<ChannelIdResponse | Not
             message: data.message,
             channel_id: this.channelId
         };
-        if (data.toAll === true) {
-            notify.to_all = true;
+        if (data.meeting) {
+            notify.to_meeting = data.meeting;
         }
         if (data.users) {
             notify.to_users = data.users;
@@ -206,7 +210,7 @@ export class NotifyService extends BaseICCGatewayService<ChannelIdResponse | Not
         if (data.channels) {
             notify.to_channels = data.channels;
         }
-        if (!(data.channels || data.toAll == true || data.users)) {
+        if (!(data.channels || data.users)) {
             notify.to_meeting = this.activeMeetingIdService.meetingId!;
         }
         return notify;
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts
index 8ded0cd644..e148b09dce 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts
@@ -148,7 +148,7 @@ export class ListenEditingDirective extends BaseComponent implements OnDestroy {
         if (user) {
             this.notifyService.sendToUsers(this.EDIT_NOTIFICATION_NAME, content, user);
         } else {
-            this.notifyService.sendToAllUsers<EditNotification>(this.EDIT_NOTIFICATION_NAME, content);
+            this.notifyService.sendToMeeting<EditNotification>(this.EDIT_NOTIFICATION_NAME, content);
         }
     }
 
diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts
index 25b96037dd..92bdebf8e5 100644
--- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts
+++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts
@@ -363,7 +363,7 @@ export class C4DialogComponent implements OnInit, OnDestroy {
      */
     public enter_search(): void {
         this.caption = this.translate.instant(`Searching for players ...`);
-        this.notifyService.sendToAllUsers(`c4_search_request`, { name: this.getPlayerName() });
+        this.notifyService.sendToMeeting(`c4_search_request`, { name: this.getPlayerName() });
     }
 
     /**