diff --git a/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs b/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs
index cd439e9b3c..6ab3f3e923 100644
--- a/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs
+++ b/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs
@@ -217,6 +217,8 @@ namespace Bit.Api.IdentityServer
                     await _deviceRepository.CreateAsync(device);
                     return device;
                 }
+
+                return existingDevice;
             }
 
             return null;