diff --git a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
index 38e21aa9..ee1ac9d3 100644
--- a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
+++ b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
@@ -3,22 +3,24 @@ module.exports = function FatalMessageServiceFactory($modal, $location, $route,
 
   var intervalDeviceInfo
 
-  var ModalInstanceCtrl = function ($scope, $modalInstance, device) {
+  var ModalInstanceCtrl = function ($scope, $modalInstance, device, tryToReconnect) {
     $scope.ok = function () {
       $modalInstance.close(true)
       $route.reload()
       //$location.path('/control/' + device.serial)
     }
 
-    // TODO: this is ugly, find why its not updated correctly (also on the device list)
-    intervalDeviceInfo = $interval(function () {
-      $scope.device = device
+    if (tryToReconnect) {
+      // TODO: this is ugly, find why its not updated correctly (also on the device list)
+      intervalDeviceInfo = $interval(function () {
+        $scope.device = device
 
-      if (device.usable) {
-        // Try to reconnect
-        $scope.ok()
-      }
-    }, 1000, 500)
+        if (device.usable) {
+          // Try to reconnect
+          $scope.ok()
+        }
+      }, 1000, 500)
+    }
 
     $scope.device = device
 
@@ -43,13 +45,16 @@ module.exports = function FatalMessageServiceFactory($modal, $location, $route,
     })
   }
 
-  FatalMessageService.open = function (device) {
+  FatalMessageService.open = function (device, tryToReconnect) {
     var modalInstance = $modal.open({
       template: require('./fatal-message.jade'),
       controller: ModalInstanceCtrl,
       resolve: {
         device: function () {
           return device
+        },
+        tryToReconnect: function () {
+          return tryToReconnect
         }
       }
     })
diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js
index 600a2189..0666a410 100644
--- a/res/app/control-panes/control-panes-controller.js
+++ b/res/app/control-panes/control-panes-controller.js
@@ -172,7 +172,7 @@ module.exports =
     $scope.$watch('device.state', function (newValue, oldValue) {
       if (newValue !== oldValue) {
         if (oldValue === 'using') {
-          FatalMessageService.open($scope.device)
+          FatalMessageService.open($scope.device, false)
         }
       } else if (typeof newValue === 'undefined' &&
         typeof oldValue === 'undefined') {