From 71bb3fc7d4e541fa01273a4a195e25f894bba6a7 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 19 Mar 2024 11:20:37 +0200
Subject: [PATCH] fix: state waterfall

---
 src/routes/+layout.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 14cb350c0..84fdba79b 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -13,9 +13,10 @@ export const ssr = false;
 export const load: LayoutLoad = async ({ depends, url }) => {
     depends(Dependencies.ACCOUNT);
 
-    redirectTo.set(url.searchParams.get('forceRedirect') || null);
-
-    url.searchParams.delete('forceRedirect');
+    if (url.searchParams.has('forceRedirect')) {
+        redirectTo.set(url.searchParams.get('forceRedirect') || null);
+        url.searchParams.delete('forceRedirect');
+    }
 
     try {
         const account = await sdk.forConsole.account.get<{ organization?: string }>();