diff --git a/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs b/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs
index e1e23ac35e..b6fb5f7a09 100644
--- a/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs
+++ b/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs
@@ -11,12 +11,16 @@ namespace Bit.Core.Models.Api
 
         public User ToUser(User existingUser)
         {
-            if(!string.IsNullOrWhiteSpace(PublicKey))
+            if(string.IsNullOrWhiteSpace(existingUser.PublicKey) && !string.IsNullOrWhiteSpace(PublicKey))
             {
                 existingUser.PublicKey = PublicKey;
             }
 
-            existingUser.PrivateKey = EncryptedPrivateKey;
+            if(string.IsNullOrWhiteSpace(existingUser.PrivateKey))
+            {
+                existingUser.PrivateKey = EncryptedPrivateKey;
+            }
+
             return existingUser;
         }
     }