diff --git a/projects/common-map/src/fm-map/components/map/map.component.ts b/projects/common-map/src/fm-map/components/map/map.component.ts
index 433c0f7..a5cb95e 100644
--- a/projects/common-map/src/fm-map/components/map/map.component.ts
+++ b/projects/common-map/src/fm-map/components/map/map.component.ts
@@ -108,7 +108,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
         this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
       }
       this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
-        if(query.querystate) {
+        if(query && query.querystate) {
           let newQueryState = tassign(mapReducers.initialQueryState);
           console.debug(`Do Query`);
           let urlparts=[];