diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs
index c137cb97bf..cd424e22c5 100644
--- a/src/Core/Services/Implementations/UserService.cs
+++ b/src/Core/Services/Implementations/UserService.cs
@@ -456,7 +456,7 @@ namespace Bit.Core.Services
 
             if(await CheckPasswordAsync(user, masterPassword))
             {
-                if(user.Key != null)
+                if(!string.IsNullOrWhiteSpace(user.Key))
                 {
                     throw new BadRequestException("User already has an updated encryption key.");
                 }