diff --git a/src/Core/Services/CryptoService.cs b/src/Core/Services/CryptoService.cs
index 20df21640..d0d2ab52b 100644
--- a/src/Core/Services/CryptoService.cs
+++ b/src/Core/Services/CryptoService.cs
@@ -288,11 +288,11 @@ namespace Bit.Core.Services
                 return null;
             }
             var orgKeys = await GetOrgKeysAsync();
-            if (orgKeys?.TryGetValue(orgId, out var orgKey) == true)
+            if (orgKeys == null || !orgKeys.ContainsKey(orgId))
             {
-                return orgKey;
+                return null;
             }
-            return null;
+            return orgKeys[orgId];
         }
 
         public Task<Dictionary<string, OrgKey>> GetOrgKeysAsync()