diff --git a/app/assets/javascripts/app/services/desktopManager.js b/app/assets/javascripts/app/services/desktopManager.js
index de16399d5..58ce492d9 100644
--- a/app/assets/javascripts/app/services/desktopManager.js
+++ b/app/assets/javascripts/app/services/desktopManager.js
@@ -80,10 +80,6 @@ class DesktopManager {
   }
 
   desktop_windowGainedFocus() {
-    if(!this.passcodeManager.isLocked()) {
-      this.syncManager.sync();
-    }
-
     this.$rootScope.$broadcast("window-gained-focus");
   }
 
diff --git a/app/assets/javascripts/app/services/passcodeManager.js b/app/assets/javascripts/app/services/passcodeManager.js
index 357225fab..79ed39f02 100644
--- a/app/assets/javascripts/app/services/passcodeManager.js
+++ b/app/assets/javascripts/app/services/passcodeManager.js
@@ -2,9 +2,10 @@ const MillisecondsPerSecond = 1000;
 
 class PasscodeManager {
 
-    constructor($rootScope, authManager, storageManager) {
+    constructor($rootScope, authManager, storageManager, syncManager) {
       this.authManager = authManager;
       this.storageManager = storageManager;
+      this.syncManager = syncManager;
       this.$rootScope = $rootScope;
 
       this._hasPasscode = this.storageManager.getItemSync("offlineParams", StorageManager.Fixed) != null;
@@ -203,6 +204,10 @@ class PasscodeManager {
         // if that's the case, it needs to be locked immediately.
         if(this.lockAfterDate && new Date() > this.lockAfterDate && !this.isLocked()) {
           this.lockApplication();
+        } else {
+          if(!this.isLocked()) {
+            this.syncManager.sync();
+          }
         }
         this.cancelAutoLockTimer();
       } else {