diff --git a/src/app/lib/map/map.component.ts b/src/app/lib/map/map.component.ts
index 63dd63db5..26af514a4 100644
--- a/src/app/lib/map/map.component.ts
+++ b/src/app/lib/map/map.component.ts
@@ -210,7 +210,8 @@ export class MapComponent implements OnChanges, OnDestroy, AfterViewInit, MapEve
     this.MapService.destroyMap();
   }
 
-  ngOnChanges(changes: SimpleChanges) {
+  async ngOnChanges(changes: SimpleChanges) {
+    await this.MapService.mapLoaded$.toPromise();
     if (changes.cursorStyle && !changes.cursorStyle.isFirstChange()) {
       this.MapService.changeCanvasCursor(changes.cursorStyle.currentValue);
     }