diff --git a/src/Core/Services/LockService.cs b/src/Core/Services/LockService.cs
index 7a0b61c9b..008f36842 100644
--- a/src/Core/Services/LockService.cs
+++ b/src/Core/Services/LockService.cs
@@ -63,6 +63,10 @@ namespace Bit.Core.Services
             {
                 return;
             }
+            if(await IsLockedAsync())
+            {
+                return;
+            }
             var lockOption = _platformUtilsService.LockTimeout();
             if(lockOption == null)
             {
@@ -77,9 +81,8 @@ namespace Bit.Core.Services
             {
                 return;
             }
-            var lockOptionsSeconds = lockOption.Value * 60;
             var diff = DateTime.UtcNow - lastActive.Value;
-            if(diff.TotalSeconds >= lockOptionsSeconds)
+            if(diff.TotalSeconds >= lockOption.Value)
             {
                 // need to lock now
                 await LockAsync(true);