diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/states/state-controller.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/states/state-controller.component.ts
index 63ad7dbcaf..5acf57095f 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/states/state-controller.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/states/state-controller.component.ts
@@ -129,7 +129,8 @@ export abstract class StateControllerComponent implements IStateControllerCompon
   protected updateStateParam(newState: string, replaceCurrentHistoryUrl = false) {
     this.currentState = newState;
     if (this.syncStateWithQueryParam) {
-      const queryParams: Params = {state: encodeURIComponent(this.currentState)};
+      const state = this.currentState ? encodeURIComponent(this.currentState) : this.currentState;
+      const queryParams: Params = {state};
       this.ngZone.run(() => {
         this.router.navigate(
           [],