diff --git a/src/viewport-three/ViewportCanvas.tsx b/src/viewport-three/ViewportCanvas.tsx
index 1efb105e..ea30c727 100644
--- a/src/viewport-three/ViewportCanvas.tsx
+++ b/src/viewport-three/ViewportCanvas.tsx
@@ -37,6 +37,7 @@ interface ViewportCanvasProps {
   whiteboxSelectionMode: WhiteboxSelectionMode;
   whiteboxSnapEnabled: boolean;
   whiteboxSnapStep: number;
+  viewportGridVisible: boolean;
   selection: EditorSelection;
   toolMode: ToolMode;
   toolPreview: ViewportToolPreview;
@@ -67,6 +68,7 @@ export function ViewportCanvas({
   whiteboxSelectionMode,
   whiteboxSnapEnabled,
   whiteboxSnapStep,
+  viewportGridVisible,
   selection,
   toolMode,
   toolPreview,
@@ -138,6 +140,10 @@ export function ViewportCanvas({
     hostRef.current?.setWhiteboxSnapSettings(whiteboxSnapEnabled, whiteboxSnapStep);
   }, [whiteboxSnapEnabled, whiteboxSnapStep]);
 
+  useEffect(() => {
+    hostRef.current?.setGridVisible(viewportGridVisible);
+  }, [viewportGridVisible]);
+
   useEffect(() => {
     hostRef.current?.setWhiteboxSelectionMode(whiteboxSelectionMode);
   }, [whiteboxSelectionMode]);
@@ -156,7 +162,7 @@ export function ViewportCanvas({
 
   useEffect(() => {
     hostRef.current?.setCameraState(cameraState);
-  }, [cameraState]);
+  }, [cameraState, sceneDocument, transformSession.kind]);
 
   useEffect(() => {
     hostRef.current?.setBrushSelectionChangeHandler(onSelectionChange);