From c3e07a5cb3792e98b2f62a4cea1a8a8deb092be3 Mon Sep 17 00:00:00 2001
From: Juan Escalada <juanescalada175@gmail.com>
Date: Thu, 30 Apr 2026 12:03:50 +0900
Subject: [PATCH] fix: prevent unexpected signouts when disabling autologout

Signed-off-by: Juan Escalada <juanescalada175@gmail.com>
---
 .../src/components/AutoLogout/disconnectedUsers.ts          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core-components/src/components/AutoLogout/disconnectedUsers.ts b/packages/core-components/src/components/AutoLogout/disconnectedUsers.ts
index ebc0cd01f5..65093333be 100644
--- a/packages/core-components/src/components/AutoLogout/disconnectedUsers.ts
+++ b/packages/core-components/src/components/AutoLogout/disconnectedUsers.ts
@@ -43,12 +43,14 @@ export const useLogoutDisconnectedUserEffect = ({
      * Considers disconnected users as inactive users.
      * If all Backstage tabs are closed and idleTimeoutMinutes are passed then logout the user anyway.
      */
+    const shouldCheckDisconnectedUser = autologoutIsEnabled && enableEffect;
+
     // Prevent lastSeen getting deleted before logged state is checked
-    if (isLoggedIn === null) {
+    if (shouldCheckDisconnectedUser && isLoggedIn === null) {
       return;
     }
 
-    if (autologoutIsEnabled && isLoggedIn && enableEffect) {
+    if (shouldCheckDisconnectedUser && isLoggedIn) {
       const lastSeenOnline = lastSeenOnlineStore.get();
       if (lastSeenOnline) {
         const now = new Date();