diff --git a/frontend/src/views/Login/Login.utils.tsx b/frontend/src/views/Login/Login.utils.tsx
index 00f6037f1..04cc494a2 100644
--- a/frontend/src/views/Login/Login.utils.tsx
+++ b/frontend/src/views/Login/Login.utils.tsx
@@ -43,6 +43,11 @@ export const useNavigateToSelectOrganization = () => {
       await navigateUserToOrg(router, config.defaultAuthOrgId);
     }
 
+    let localOrgId = localStorage.getItem("orgData.id")
+    if(!cliCallbackPort && localOrgId != null){
+      await navigateUserToOrg(router, localOrgId);
+    }
+
     queryClient.invalidateQueries(userKeys.getUser);
     let redirectTo = "/login/select-organization";