diff --git a/src/viewport-three/ViewportCanvas.tsx b/src/viewport-three/ViewportCanvas.tsx
index 01549e1e..b405e5f7 100644
--- a/src/viewport-three/ViewportCanvas.tsx
+++ b/src/viewport-three/ViewportCanvas.tsx
@@ -175,8 +175,8 @@ export function ViewportCanvas({
   }, [toolMode]);
 
   useEffect(() => {
-    hostRef.current?.setBoxCreatePreview(toolPreview.kind === "box-create" ? toolPreview.center : null);
-  }, [toolPreview]);
+    hostRef.current?.setBoxCreatePreview(toolMode === "box-create" && toolPreview.kind === "box-create" ? toolPreview.center : null);
+  }, [toolMode, toolPreview]);
 
   useEffect(() => {
     if (focusRequestId === 0) {