diff --git a/packages/asc-web-common/store/SettingsStore.js b/packages/asc-web-common/store/SettingsStore.js
index fb36d50d919..4b8d5ab6a18 100644
--- a/packages/asc-web-common/store/SettingsStore.js
+++ b/packages/asc-web-common/store/SettingsStore.js
@@ -251,8 +251,9 @@ class SettingsStore {
             clearInterval(interval);
             reject();
           }
-        } catch {
-          return;
+        } catch (e) {
+          clearInterval(interval);
+          reject(e);
         }
       }, 500);
     });
diff --git a/products/ASC.Files/Client/src/components/dialogs/ThirdPartyDialog/index.js b/products/ASC.Files/Client/src/components/dialogs/ThirdPartyDialog/index.js
index 5ece6e5d42e..5d6eaf73dee 100644
--- a/products/ASC.Files/Client/src/components/dialogs/ThirdPartyDialog/index.js
+++ b/products/ASC.Files/Client/src/components/dialogs/ThirdPartyDialog/index.js
@@ -109,12 +109,16 @@ const ThirdPartyDialog = (props) => {
         "Authorization",
         "height=600, width=1020"
       );
-      openConnectWindow(item.title, authModal).then((modal) =>
-        getOAuthToken(modal).then((token) => {
+      openConnectWindow(item.title, authModal)
+        .then(getOAuthToken)
+        .then((token) => {
           authModal.close();
           showOAuthModal(token, item);
         })
-      );
+        .catch((e) => {
+          if (!e) return;
+          console.error(e);
+        });
     } else {
       item.title = connectedCloudsTitleTranslation(item.title, t);
       setConnectItem(item);