diff --git a/DysonNetwork.Pusher/Notification/PushService.cs b/DysonNetwork.Pusher/Notification/PushService.cs
index 13d4b45..4cdad41 100644
--- a/DysonNetwork.Pusher/Notification/PushService.cs
+++ b/DysonNetwork.Pusher/Notification/PushService.cs
@@ -373,6 +373,7 @@ public class PushService
         _db.Notifications.AddRange(accounts.Select(a => new Notification
         {
             AccountId = a,
+            Topic = notification.Topic,
             Content = notification.Content,
             Title = notification.Title,
             Subtitle = notification.Subtitle,
diff --git a/DysonNetwork.Pusher/Services/PusherServiceGrpc.cs b/DysonNetwork.Pusher/Services/PusherServiceGrpc.cs
index db91f56..09dd973 100644
--- a/DysonNetwork.Pusher/Services/PusherServiceGrpc.cs
+++ b/DysonNetwork.Pusher/Services/PusherServiceGrpc.cs
@@ -98,7 +98,8 @@ public override Task<Empty> PushWebSocketPacketToDevice(PushWebSocketPacketToDev
             Content = request.Notification.Body,
             Meta = request.Notification.HasMeta
                 ? GrpcTypeHelper.ConvertByteStringToObject<Dictionary<string, object?>>(request.Notification.Meta) ?? []
-                : []
+                : [],
+            AccountId = Guid.Parse(request.UserId),
         };
         
         if (request.Notification.ActionUri is not null)