diff --git a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs
index 3349aada61..404bbd00b1 100644
--- a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs
+++ b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs
@@ -172,8 +172,8 @@ public class AzureQueuePushNotificationService : IPushNotificationService
         {
             Id = notification.Id,
             Global = notification.Global,
-            UserId = notification.Id,
-            OrganizationId = notification.Id,
+            UserId = notification.UserId,
+            OrganizationId = notification.OrganizationId,
             ClientType = notification.ClientType,
             RevisionDate = notification.RevisionDate
         };
diff --git a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
index b302d28010..7c0d563fa1 100644
--- a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
+++ b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs
@@ -200,8 +200,8 @@ public class NotificationHubPushNotificationService : IPushNotificationService
         {
             Id = notification.Id,
             Global = notification.Global,
-            UserId = notification.Id,
-            OrganizationId = notification.Id,
+            UserId = notification.UserId,
+            OrganizationId = notification.OrganizationId,
             ClientType = notification.ClientType,
             RevisionDate = notification.RevisionDate
         };
diff --git a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs
index bde4348534..f9f6ec63be 100644
--- a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs
+++ b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs
@@ -179,8 +179,8 @@ public class NotificationsApiPushNotificationService : BaseIdentityClientService
         {
             Id = notification.Id,
             Global = notification.Global,
-            UserId = notification.Id,
-            OrganizationId = notification.Id,
+            UserId = notification.UserId,
+            OrganizationId = notification.OrganizationId,
             ClientType = notification.ClientType,
             RevisionDate = notification.RevisionDate
         };
diff --git a/src/Core/Services/Implementations/RelayPushNotificationService.cs b/src/Core/Services/Implementations/RelayPushNotificationService.cs
index 6e5fd5d42f..aac39f955f 100644
--- a/src/Core/Services/Implementations/RelayPushNotificationService.cs
+++ b/src/Core/Services/Implementations/RelayPushNotificationService.cs
@@ -195,8 +195,8 @@ public class RelayPushNotificationService : BaseIdentityClientService, IPushNoti
         {
             Id = notification.Id,
             Global = notification.Global,
-            UserId = notification.Id,
-            OrganizationId = notification.Id,
+            UserId = notification.UserId,
+            OrganizationId = notification.OrganizationId,
             ClientType = notification.ClientType,
             RevisionDate = notification.RevisionDate
         };