diff --git a/ui/src/components/app-sidebar-session-navigation.ts b/ui/src/components/app-sidebar-session-navigation.ts
index ad0debf7f968..e431cc5dac2b 100644
--- a/ui/src/components/app-sidebar-session-navigation.ts
+++ b/ui/src/components/app-sidebar-session-navigation.ts
@@ -287,15 +287,14 @@ export class AppSidebarSessionNavigationElement extends AppSidebarBase {
 
   private setApplicationSession(sessionKey: string) {
     const context = this.context;
-    if (!context) {
-      return;
+    if (context) {
+      selectApplicationSession({
+        selection: context.agentSelection,
+        gateway: context.gateway,
+        sessionKey,
+        agentId: parseAgentSessionKey(sessionKey)?.agentId ?? this.selectedAgentIdForSessions(),
+      });
     }
-    selectApplicationSession({
-      selection: context.agentSelection,
-      gateway: context.gateway,
-      sessionKey,
-      agentId: parseAgentSessionKey(sessionKey)?.agentId ?? this.selectedAgentIdForSessions(),
-    });
   }
 
   readonly selectSession = (sessionKey: string) => {