diff --git a/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts b/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
index 114c165443..7641520387 100644
--- a/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
+++ b/webapp/packages/core-app/src/shared/SessionExpireWarningDialog/SessionExpireWarningDialogService.ts
@@ -52,17 +52,15 @@ export class SessionExpireWarningDialogService extends Bootstrap {
 
       const remainingTime = new Date(sessionExpiredTime).getTime() - Date.now();
 
-      if (this.sessionExpireService.expired
-        || !sessionDuration
-        || sessionDuration < WARN_IN
-        || (this.dialogInternalPromise && remainingTime > WARN_IN)
-      ) {
+      if (this.sessionExpireService.expired || !sessionDuration || sessionDuration < WARN_IN) {
         this.close();
         return;
       }
 
       if (remainingTime < WARN_IN) {
         this.open();
+      } else {
+        this.close();
       }
     };