diff --git a/.changeset/gorgeous-files-flow.md b/.changeset/gorgeous-files-flow.md
new file mode 100644
index 000000000..1f7565cb9
--- /dev/null
+++ b/.changeset/gorgeous-files-flow.md
@@ -0,0 +1,5 @@
+---
+"@orchestrator-ui/orchestrator-ui-components": patch
+---
+
+Fixes signOut modal showing in some cases
diff --git a/apps/wfo-ui b/apps/wfo-ui
index 6999cb6bb..b305c94f7 160000
--- a/apps/wfo-ui
+++ b/apps/wfo-ui
@@ -1 +1 @@
-Subproject commit 6999cb6bb154f6bb624ad9461ea8ee611b89ddf7
+Subproject commit b305c94f7fcc4fae21db234f1a966a1c00079b8b
diff --git a/packages/orchestrator-ui-components/src/components/WfoRouteChangeListener/WfoRouteChangeListener.tsx b/packages/orchestrator-ui-components/src/components/WfoRouteChangeListener/WfoRouteChangeListener.tsx
index 2691a08ae..bd2a46d7d 100644
--- a/packages/orchestrator-ui-components/src/components/WfoRouteChangeListener/WfoRouteChangeListener.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoRouteChangeListener/WfoRouteChangeListener.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 
-import { getSession, signOut } from 'next-auth/react';
+import { getSession, signIn } from 'next-auth/react';
 import { useRouter } from 'next/router';
 
 import { useGetOrchestratorConfig } from '@/hooks';
@@ -13,7 +13,7 @@ export const WfoRouteChangeListener = () => {
         if (authActive) {
             getSession().then((session) => {
                 if (!session) {
-                    signOut();
+                    signIn();
                 }
             });
         }
diff --git a/packages/orchestrator-ui-components/src/rtk/api.ts b/packages/orchestrator-ui-components/src/rtk/api.ts
index 57aae71c9..f89595ed7 100644
--- a/packages/orchestrator-ui-components/src/rtk/api.ts
+++ b/packages/orchestrator-ui-components/src/rtk/api.ts
@@ -65,7 +65,7 @@ export const orchestratorApi = createApi({
         const { baseQueryType, apiName } = extraOptions || {};
 
         const state = api.getState() as RootState;
-        const { orchestratorApiBaseUrl, graphqlEndpointCore } =
+        const { orchestratorApiBaseUrl, graphqlEndpointCore, authActive } =
             state.orchestratorConfig;
 
         const customApi = state.customApis?.find(
@@ -87,7 +87,7 @@ export const orchestratorApi = createApi({
                     prepareHeaders,
                     customErrors: (error) => {
                         const { name, message, stack, response } = error;
-                        if (response?.errors && response.errors?.length > 0) {
+                        if (response?.errors?.length && authActive) {
                             response.errors.map((error) => {
                                 // TODO: https://github.com/workfloworchestrator/orchestrator-ui-library/issues/1105
                                 if (