diff --git a/webapp/packages/core-authentication/src/UserInfoResource.ts b/webapp/packages/core-authentication/src/UserInfoResource.ts
index 8ec9d23768..132327173a 100644
--- a/webapp/packages/core-authentication/src/UserInfoResource.ts
+++ b/webapp/packages/core-authentication/src/UserInfoResource.ts
@@ -140,6 +140,8 @@ export class UserInfoResource extends CachedDataResource<UserInfo | null, void,
             return authInfo as AuthInfo;
           },
           1000,
+          undefined,
+          5 * 60 * 1000,
         );
 
         const authInfo = await activeTask;
diff --git a/webapp/packages/core-executor/src/TaskScheduler/TimeoutError.ts b/webapp/packages/core-executor/src/TaskScheduler/TimeoutError.ts
new file mode 100644
index 0000000000..b97381f3c5
--- /dev/null
+++ b/webapp/packages/core-executor/src/TaskScheduler/TimeoutError.ts
@@ -0,0 +1,15 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export class TimeoutError extends Error {
+  constructor(message?: string, options?: ErrorOptions) {
+    super(message, options);
+
+    this.name = 'Timeout Error';
+  }
+}
diff --git a/webapp/packages/core-executor/src/whileTask.ts b/webapp/packages/core-executor/src/whileTask.ts
index 9a28532680..00b710d2cd 100644
--- a/webapp/packages/core-executor/src/whileTask.ts
+++ b/webapp/packages/core-executor/src/whileTask.ts
@@ -6,35 +6,54 @@
  * you may not use this file except in compliance with the License.
  */
 import { AutoRunningTask } from './TaskScheduler/AutoRunningTask';
+import { CancelError } from './TaskScheduler/CancelError';
 import type { ITask } from './TaskScheduler/ITask';
 import { Task } from './TaskScheduler/Task';
+import { TimeoutError } from './TaskScheduler/TimeoutError';
 
 export function whileTask<T>(
   callback: (value: T) => Promise<boolean> | boolean,
   task: () => Promise<T>,
   interval: number,
   cancelMessage?: string,
+  timeout?: number,
 ): ITask<T> {
   let resolve: (value: T | PromiseLike<T>) => void;
   let reject: (reason?: any) => void;
+  let fulfilled = false;
+
+  let intervalTimeoutId: NodeJS.Timeout | null = null;
+  let timeoutId: NodeJS.Timeout | null = null;
+  let activeTask: Promise<T> | null = null;
+  let stopped = false;
 
   const lockPromise = new Promise<T>((_resolve, _reject) => {
     resolve = _resolve;
     reject = _reject;
+  }).finally(() => {
+    if (intervalTimeoutId !== null) {
+      clearTimeout(intervalTimeoutId);
+    }
+
+    if (timeoutId !== null) {
+      clearTimeout(timeoutId);
+    }
+
+    fulfilled = true;
   });
 
-  let timeoutId: NodeJS.Timeout | null;
-  let activeTask: Promise<T> | null;
-  let stopped = false;
-
   function stop() {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
+    if (intervalTimeoutId !== null) {
+      clearTimeout(intervalTimeoutId);
     }
     stopped = true;
   }
 
   async function cancelTask(exception?: any) {
+    if (fulfilled) {
+      return;
+    }
+
     stop();
 
     if (activeTask instanceof Task) {
@@ -44,6 +63,10 @@ export function whileTask<T>(
     reject(exception);
   }
 
+  if (timeout !== undefined) {
+    timeoutId = setTimeout(() => cancelTask(new TimeoutError('Task timeout exceeded')), timeout);
+  }
+
   function runTask() {
     activeTask = task();
     activeTask
@@ -56,7 +79,7 @@ export function whileTask<T>(
         if (state) {
           resolve(value);
         } else if (!stopped) {
-          timeoutId = setTimeout(runTask, interval);
+          intervalTimeoutId = setTimeout(runTask, interval);
         }
       })
       .catch(cancelTask);
@@ -67,6 +90,6 @@ export function whileTask<T>(
       runTask();
       return lockPromise;
     },
-    () => cancelTask(new Error(cancelMessage ?? 'Task was cancelled')),
+    () => cancelTask(new CancelError(cancelMessage ?? 'Task was cancelled')),
   );
 }