diff --git a/src/App/Services/LockService.cs b/src/App/Services/LockService.cs
index f2a0711de..1d2adde04 100644
--- a/src/App/Services/LockService.cs
+++ b/src/App/Services/LockService.cs
@@ -76,7 +76,11 @@ namespace Bit.App.Services
             }
 
             // Set the new lock timer id
-            _appSettings.LockTimerId = _timerId;
+            if(_timerId != null)
+            {
+                _appSettings.LockTimerId = _timerId;
+            }
+
             if(returnNone)
             {
                 return LockType.None;
diff --git a/src/iOS.Extension/LoadingViewController.cs b/src/iOS.Extension/LoadingViewController.cs
index e1fc942ee..46c4a0a7b 100644
--- a/src/iOS.Extension/LoadingViewController.cs
+++ b/src/iOS.Extension/LoadingViewController.cs
@@ -31,7 +31,6 @@ namespace Bit.iOS.Extension
         private readonly JsonSerializerSettings _jsonSettings =
             new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
         private IGoogleAnalyticsService _googleAnalyticsService;
-        private ILockService _lockService;
 
         public LoadingViewController(IntPtr handle) : base(handle)
         { }
@@ -45,7 +44,6 @@ namespace Bit.iOS.Extension
             View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
             _context.ExtContext = ExtensionContext;
             _googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>();
-            _lockService = Resolver.Resolve<ILockService>();
 
             if(!_setupHockeyApp)
             {
@@ -176,8 +174,6 @@ namespace Bit.iOS.Extension
         private void ContinueOn()
         {
             Debug.WriteLine("BW Log, Segue to setup, login add or list.");
-            _lockService.UpdateLastActivity();
-
             if(_context.ProviderType == Constants.UTTypeAppExtensionSaveLoginAction)
             {
                 PerformSegue("newLoginSegue", this);
@@ -247,7 +243,6 @@ namespace Bit.iOS.Extension
 
             if(itemData != null)
             {
-                _lockService.UpdateLastActivity();
                 _googleAnalyticsService.TrackExtensionEvent("AutoFilled", _context.ProviderType);
             }
             else