diff --git a/src/Core/Services/CipherService.cs b/src/Core/Services/CipherService.cs
index dfdf554e7..13628d308 100644
--- a/src/Core/Services/CipherService.cs
+++ b/src/Core/Services/CipherService.cs
@@ -224,7 +224,7 @@ namespace Bit.Core.Services
             {
                 return Task.FromResult(DecryptedCipherCache);
             }
-            if(_getAllDecryptedTask != null)
+            if(_getAllDecryptedTask != null && !_getAllDecryptedTask.IsCompleted && !_getAllDecryptedTask.IsFaulted)
             {
                 return _getAllDecryptedTask;
             }
diff --git a/src/Core/Services/CryptoService.cs b/src/Core/Services/CryptoService.cs
index 764b72500..a8e7320d0 100644
--- a/src/Core/Services/CryptoService.cs
+++ b/src/Core/Services/CryptoService.cs
@@ -121,7 +121,7 @@ namespace Bit.Core.Services
             {
                 return Task.FromResult(_encKey);
             }
-            if(_getEncKeysTask != null)
+            if(_getEncKeysTask != null && !_getEncKeysTask.IsCompleted && !_getEncKeysTask.IsFaulted)
             {
                 return _getEncKeysTask;
             }
@@ -224,7 +224,7 @@ namespace Bit.Core.Services
             {
                 return Task.FromResult(_orgKeys);
             }
-            if(_getOrgKeysTask != null)
+            if(_getOrgKeysTask != null && !_getOrgKeysTask.IsCompleted && !_getOrgKeysTask.IsFaulted)
             {
                 return _getOrgKeysTask;
             }