diff --git a/src/Api/Controllers/DevicesController.cs b/src/Api/Controllers/DevicesController.cs
index 0ff4e93abe..eaa572b7ec 100644
--- a/src/Api/Controllers/DevicesController.cs
+++ b/src/Api/Controllers/DevicesController.cs
@@ -206,7 +206,11 @@ public class DevicesController : Controller
             throw new NotFoundException();
         }
 
-        await _deviceService.SaveAsync(model.ToData(), device);
+        await _deviceService.SaveAsync(
+            model.ToData(),
+            device,
+            _currentContext.Organizations.Select(org => org.Id.ToString())
+        );
     }
 
     [AllowAnonymous]
diff --git a/src/Core/Services/IDeviceService.cs b/src/Core/Services/IDeviceService.cs
index cd055f8b46..78739e081d 100644
--- a/src/Core/Services/IDeviceService.cs
+++ b/src/Core/Services/IDeviceService.cs
@@ -6,7 +6,7 @@ namespace Bit.Core.Services;
 
 public interface IDeviceService
 {
-    Task SaveAsync(WebPushRegistrationData webPush, Device device);
+    Task SaveAsync(WebPushRegistrationData webPush, Device device, IEnumerable<string> organizationIds);
     Task SaveAsync(Device device);
     Task ClearTokenAsync(Device device);
     Task DeactivateAsync(Device device);
diff --git a/src/Core/Services/Implementations/DeviceService.cs b/src/Core/Services/Implementations/DeviceService.cs
index 165fab0237..931dfccdec 100644
--- a/src/Core/Services/Implementations/DeviceService.cs
+++ b/src/Core/Services/Implementations/DeviceService.cs
@@ -29,9 +29,17 @@ public class DeviceService : IDeviceService
         _globalSettings = globalSettings;
     }
 
-    public async Task SaveAsync(WebPushRegistrationData webPush, Device device)
+    public async Task SaveAsync(WebPushRegistrationData webPush, Device device, IEnumerable<string> organizationIds)
     {
-        await SaveAsync(new PushRegistrationData(webPush.Endpoint, webPush.P256dh, webPush.Auth), device);
+        await _pushRegistrationService.CreateOrUpdateRegistrationAsync(
+            new PushRegistrationData(webPush.Endpoint, webPush.P256dh, webPush.Auth),
+            device.Id.ToString(),
+            device.UserId.ToString(),
+            device.Identifier,
+            device.Type,
+            organizationIds,
+            _globalSettings.Installation.Id
+        );
     }
 
     public async Task SaveAsync(Device device)