diff --git a/src/js/controllers/modals/pin.js b/src/js/controllers/modals/pin.js
index ec1623234..bb7fa41a9 100644
--- a/src/js/controllers/modals/pin.js
+++ b/src/js/controllers/modals/pin.js
@@ -122,7 +122,6 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
         break;
       case 'check':
         if (isMatch(currentPin)) {
-          applicationService.successfullUnlocked = true;
           $scope.hideModal();
           return;
         }
diff --git a/src/js/routes.js b/src/js/routes.js
index f0781c0a9..8308559a4 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -1231,6 +1231,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
               // Clear history
               $ionicHistory.clearHistory();
             });
+            applicationService.appLockModal('check');
           });
         };
         // After everything have been loaded, initialize handler URL
@@ -1258,7 +1259,5 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       $log.debug('Route change from:', fromState.name || '-', ' to:', toState.name);
       $log.debug('            toParams:' + JSON.stringify(toParams || {}));
       $log.debug('            fromParams:' + JSON.stringify(fromParams || {}));
-
-      if (!applicationService.successfullUnlocked) applicationService.appLockModal('check');
     });
   });
diff --git a/src/js/services/applicationService.js b/src/js/services/applicationService.js
index c1c6584a3..7a95d636e 100644
--- a/src/js/services/applicationService.js
+++ b/src/js/services/applicationService.js
@@ -3,9 +3,6 @@ angular.module('copayApp.services')
   .factory('applicationService', function($rootScope, $timeout, $ionicHistory, $ionicModal, platformInfo, fingerprintService, openURLService, configService, $state) {
     var root = {};
 
-    root.successfullUnlocked = false;
-    root.pinModalIsOpen = false;
-
     var isChromeApp = platformInfo.isChromeApp;
     var isNW = platformInfo.isNW;
 
@@ -42,12 +39,10 @@ angular.module('copayApp.services')
           root.fingerprintModal();
           return;
         }
-        root.successfullUnlocked = true;
       });
     };
 
     root.pinModal = function(action) {
-      if (root.pinModalIsOpen) return;
 
       var scope = $rootScope.$new(true);
       scope.action = action;
@@ -61,12 +56,10 @@ angular.module('copayApp.services')
         scope.openModal();
       });
       scope.openModal = function() {
-        root.pinModalIsOpen = true;
         scope.pinModal.show();
       };
       scope.hideModal = function() {
         scope.$emit('pinModalClosed');
-        root.pinModalIsOpen = false;
         scope.pinModal.hide();
       };
     };