From 5a9b5d22fa5b849ffda6cdf1efd0d8748ac25359 Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@automattic.com>
Date: Thu, 30 Nov 2023 15:36:31 +0000
Subject: [PATCH] Only restore last url if there is already a session

---
 frontend/iframe/viewmodels/RootViewModel.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/iframe/viewmodels/RootViewModel.ts b/frontend/iframe/viewmodels/RootViewModel.ts
index 2efa7d8..f29e0fb 100644
--- 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";