diff --git a/public/app/stores/ViewStore/ViewStore.ts b/public/app/stores/ViewStore/ViewStore.ts
index d00bf3c429f..ba966a194d8 100644
--- a/public/app/stores/ViewStore/ViewStore.ts
+++ b/public/app/stores/ViewStore/ViewStore.ts
@@ -26,7 +26,9 @@ export const ViewStore = types
     function updateQuery(query: any) {
       self.query.clear();
       for (let key of Object.keys(query)) {
-        self.query.set(key, query[key]);
+        if (query[key]) {
+          self.query.set(key, query[key]);
+        }
       }
     }
 
@@ -34,7 +36,9 @@ export const ViewStore = types
     function updateRouteParams(routeParams: any) {
       self.routeParams.clear();
       for (let key of Object.keys(routeParams)) {
-        self.routeParams.set(key, routeParams[key]);
+        if (routeParams[key]) {
+          self.routeParams.set(key, routeParams[key]);
+        }
       }
     }