diff --git a/src/app/core/services/route.service.ts b/src/app/core/services/route.service.ts
index 0b00420797..8aee755e3b 100644
--- a/src/app/core/services/route.service.ts
+++ b/src/app/core/services/route.service.ts
@@ -18,7 +18,7 @@ import { AddUrlToHistoryAction } from '../history/history.actions';
  */
 export const routeParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state.route.params
+  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.params : undefined
 );
 
 /**
@@ -26,7 +26,7 @@ export const routeParametersSelector = createSelector(
  */
 export const queryParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state.route.queryParams
+  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.queryParams : undefined
 );
 
 /**