diff --git a/frontend/app/Router.tsx b/frontend/app/Router.tsx
index 48e69c77f..74ed041db 100644
--- a/frontend/app/Router.tsx
+++ b/frontend/app/Router.tsx
@@ -166,10 +166,10 @@ const Router: React.FC<RouterProps> = (props) => {
   }, [scopeSetup])
 
   useEffect(() => {
-    if (isLoggedIn && location.pathname.includes('login') && localSpotJwt) {
-      if (!isTokenExpired(localSpotJwt)) {
+    if (isLoggedIn && (location.pathname.includes('login') || isSpotCb)) {
+      if (localSpotJwt && !isTokenExpired(localSpotJwt)) {
         handleSpotLogin(localSpotJwt);
-      } else if (isSpotCb) {
+      } else {
         logout();
       }
     }