diff --git a/src/pages/WorkspaceSwitcherPage.tsx b/src/pages/WorkspaceSwitcherPage.tsx
index 6f077f7644745..9b7b176a3a5bb 100644
--- a/src/pages/WorkspaceSwitcherPage.tsx
+++ b/src/pages/WorkspaceSwitcherPage.tsx
@@ -111,9 +111,11 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                 setSelectedOption(undefined);
             }
             setActiveWorkspaceID(policyID);
-            Navigation.goBack();
+
             if (policyID !== activeWorkspaceID) {
                 Navigation.navigateWithSwitchPolicyID({policyID});
+            } else {
+                Navigation.goBack();
             }
         },
         [activeWorkspaceID, setActiveWorkspaceID],