diff --git a/console/src/app/app.component.ts b/console/src/app/app.component.ts
index 1a9ef8cd9..a8b7b2aa7 100644
--- a/console/src/app/app.component.ts
+++ b/console/src/app/app.component.ts
@@ -265,7 +265,12 @@ export class AppComponent implements OnDestroy {
   }
 
   public changedOrg(org: Org.AsObject): void {
-    this.router.navigate(['/org']);
+    // Reference: https://stackoverflow.com/a/58114797
+    const currentUrl = this.router.url;
+    this.router.navigateByUrl('/', { skipLocationChange: true }).then(() => {
+      // We use navigateByUrl as our urls may have queryParams
+      this.router.navigateByUrl(currentUrl);
+    });
   }
 
   private setLanguage(): void {