diff --git a/src/modules/CesiumController.js b/src/modules/CesiumController.js
index b668e06f9..1a3ccdce7 100644
--- a/src/modules/CesiumController.js
+++ b/src/modules/CesiumController.js
@@ -307,21 +307,37 @@ export class CesiumController {
       this.viewer.scene.morphTo3D();
       return;
     }
-    if (this.sats.enabledComponents.includes("Orbit")) {
-      useToastProxy().add({
-        severity: "warn",
-        summary: "Warning",
-        detail: "Disable the Orbit satellite element for 2D mode",
-        life: 3000,
-      });
-      return;
-    }
-    if (sceneMode === "2D") {
-      this.viewer.scene.morphTo2D();
+
+    const morph = () => {
+     if (sceneMode === "2D") {
+        this.viewer.scene.morphTo2D();
       return;
-    }
-    if (sceneMode === "Columbus") {
-      this.viewer.scene.morphToColumbusView();
+      }
+      if (sceneMode === "Columbus") {
+        this.viewer.scene.morphToColumbusView();
+      }
+    };
+
+    if (this.sats.enabledComponents.includes("Orbit")) {
+      this.sats.disableComponent("Orbit");
+
+      const enableOrbits = () => {
+        this.sats.enableComponent("Orbit");
+        this.viewer.scene.morphComplete.removeEventListener(enableOrbits);
+      };
+      this.viewer.scene.morphComplete.addEventListener(enableOrbits);
+
+      // wait until orbit elements are removed
+      const checkPending = () => {
+        if (!this.sats.pendingUpdate) {
+          morph();
+        } else {
+          requestAnimationFrame(checkPending);
+        }
+      };
+      checkPending();
+    } else {
+      morph();
     }
   }
 
diff --git a/src/modules/SatelliteManager.js b/src/modules/SatelliteManager.js
index 83eb4d145..caa08e8ce 100644
--- a/src/modules/SatelliteManager.js
+++ b/src/modules/SatelliteManager.js
@@ -316,4 +316,8 @@ export class SatelliteManager {
       }
     });
   }
+
+  get pendingUpdate() {
+    return SatelliteComponentCollection.primitivePendingUpdate;
+  }
 }