diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index fe2197ed5..8bd0f2b08 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -32,8 +32,11 @@ export default class AppStateController extends EventEmitter {
 
     this._showUnlockRequest = showUnlockRequest
 
-    preferencesStore.subscribe((state) => {
-      this._setInactiveTimeout(state.preferences.autoLockTimeLimit)
+    preferencesStore.subscribe(({ preferences }) => {
+      const currentState = this.store.getState()
+      if (currentState.timeoutMinutes !== preferences.autoLockTimeLimit) {
+        this._setInactiveTimeout(preferences.autoLockTimeLimit)
+      }
     })
 
     this._setInactiveTimeout(preferences.autoLockTimeLimit)