diff --git a/source/client/components/CVOrbitNavigation.ts b/source/client/components/CVOrbitNavigation.ts
index 7ebef5f8..27535966 100644
--- a/source/client/components/CVOrbitNavigation.ts
+++ b/source/client/components/CVOrbitNavigation.ts
@@ -207,7 +207,10 @@ export default class CVOrbitNavigation extends CObject3D
                 /*edge case when loaded event triggers before document parsing */
             }
             else {
-                controller.camera = cameraComponent.camera;     
+                // Hack until we have a better way to make sure camera is initialized on first zoom
+                cameraComponent.camera.aspect = controller.camera.aspect;
+                
+                controller.camera = cameraComponent.camera;
                 controller.zoomExtents(this._modelBoundingBox);
                 cameraComponent.ins.zoom.set();
             }