diff --git a/src/App/Services/CryptoService.cs b/src/App/Services/CryptoService.cs
index fc564abbf..c6e42cb37 100644
--- a/src/App/Services/CryptoService.cs
+++ b/src/App/Services/CryptoService.cs
@@ -65,9 +65,10 @@ namespace Bit.App.Services
                 {
                     PreviousKey = _key;
                     _secureStorage.Delete(KeyKey);
-                    _key = null;
-                    _legacyEtmKey = null;
                 }
+
+                _key = value;
+                _legacyEtmKey = null;
             }
         }