diff --git a/UI/WebServerResources/js/Common/Common.app.js b/UI/WebServerResources/js/Common/Common.app.js
index 32af5d541..d08414e33 100644
--- a/UI/WebServerResources/js/Common/Common.app.js
+++ b/UI/WebServerResources/js/Common/Common.app.js
@@ -323,10 +323,13 @@
                 $timeout(function() {
                   var $http = $injector.get('$http');
                   $http(rejection.config)
-                    .then(deferred.resolve, deferred.reject)
-                    .finally(function () {
+                    .then(function() {
                       $window.recovered = true;
-                      $timeout(iframe.remove, 500); // Wait before removing the iframe
+                      $timeout(iframe.remove, 500);
+                      return deferred.resolve();
+                    }, function () {
+                      $window.recovered = true;
+                      return deferred.reject(); // Will reload the page
                     });
                 }, 500); // Wait before replaying the request
               }