diff --git a/src/runtime-three/runtime-scene-build.ts b/src/runtime-three/runtime-scene-build.ts
index 320a3c71..1d4f31cf 100644
--- a/src/runtime-three/runtime-scene-build.ts
+++ b/src/runtime-three/runtime-scene-build.ts
@@ -5,6 +5,7 @@ import {
   createActorControlTargetRef,
   createActiveSceneControlTargetRef,
   createAmbientLightIntensityControlChannelDescriptor,
+  createCameraRigControlTargetRef,
   createControlTargetDescriptor,
   createDefaultResolvedControlSource,
   createEmptyRuntimeResolvedControlState,
@@ -17,6 +18,7 @@ import {
   createResolvedActorAnimationPlaybackState,
   createResolvedActorPathAssignmentState,
   createResolvedAmbientLightIntensityChannelValue,
+  createResolvedCameraRigOverrideState,
   createResolvedInteractionEnabledState,
   createResolvedLightColorState,
   createResolvedLightEnabledState,
@@ -1237,6 +1239,11 @@ function buildRuntimeControlSurface(
       target: globalTarget,
       value: false,
       source: defaultSource
+    }),
+    createResolvedCameraRigOverrideState({
+      target: globalTarget,
+      entityId: null,
+      source: defaultSource
     })
   );
 
@@ -1321,6 +1328,15 @@ function buildRuntimeControlSurface(
     );
   }
 
+  for (const cameraRig of collections.entities.cameraRigs) {
+    targets.push(
+      createControlTargetDescriptor(
+        createCameraRigControlTargetRef(cameraRig.entityId),
+        ["cameraRigOverride"]
+      )
+    );
+  }
+
   for (const pointLight of collections.localLights.pointLights) {
     const target = createLightControlTargetRef(
       "pointLight",