Only restore last url if there is already a session

Automattic · Nov 30, 2023 · 5a9b5d2 · 5a9b5d2
1 parent 1324eb4
commit 5a9b5d2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/frontend/iframe/viewmodels/RootViewModel.ts b/frontend/iframe/viewmodels/RootViewModel.ts
@@ -178,7 +178,9 @@ export class RootViewModel extends ViewModel<SegmentType, Options> {
             }
         }
 
-        let shouldRestoreLastUrl = true;
+        // Only restore last url if there is already a session.
+        // This will result in the user being sent to login screen.
+        let shouldRestoreLastUrl = sessionInfos.length > 1;
 
         // We never want to show the session picker, even if it was the last url.
         const willShowSessionPicker = this.platform.history.getLastSessionUrl() === "#/session";