diff --git a/projects/ngx-maplibre-gl/src/lib/map/map.service.ts b/projects/ngx-maplibre-gl/src/lib/map/map.service.ts
index 9e58283b..2075b2af 100644
--- a/projects/ngx-maplibre-gl/src/lib/map/map.service.ts
+++ b/projects/ngx-maplibre-gl/src/lib/map/map.service.ts
@@ -37,7 +37,6 @@ import {
   type ControlPosition,
 } from 'maplibre-gl';
 import { AsyncSubject, Subscription } from 'rxjs';
-import { first } from 'rxjs/operators';
 import type {
   LayerEvents,
   MapEvent,
@@ -107,21 +106,18 @@ export class MapService {
   readonly mapLoaded$ = this.mapLoaded.asObservable();
 
   setup(options: SetupMap) {
-    // Need onStable to wait for a potential @angular/route transition to end
-    this.zone.onStable.pipe(first()).subscribe(() => {
-      // Workaround rollup issue
-      this.createMap(options.mapOptions as MapOptions);
-      this.hookEvents(options.mapEvents);
-      this.mapEvents = options.mapEvents;
-      this.mapCreated.next(undefined);
-      this.mapCreated.complete();
-
-      if (options.mapOptions.terrain) {
-        this.mapInstance.on('load', () => {
-          this.updateTerrain(options.mapOptions.terrain!);
-        });
-      }
-    });
+    // Workaround rollup issue
+    this.createMap(options.mapOptions as MapOptions);
+    this.hookEvents(options.mapEvents);
+    this.mapEvents = options.mapEvents;
+    this.mapCreated.next(undefined);
+    this.mapCreated.complete();
+
+    if (options.mapOptions.terrain) {
+      this.mapInstance.on('load', () => {
+        this.updateTerrain(options.mapOptions.terrain!);
+      });
+    }
   }
 
   destroyMap() {
@@ -646,9 +642,7 @@ export class MapService {
       this.mapInstance.setStyle(options.style!);
     }
 
-    this.subscription.add(
-      this.zone.onMicrotaskEmpty.subscribe(() => this.applyChanges())
-    );
+    this.subscription.add(this.applyChanges());
   }
 
   private removeMarkers() {