diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index f4ada18d..865f6488 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -765,6 +765,7 @@ export class ViewportHost {
     selection: EditorSelection,
     activeSelectionId: string | null
   ) {
+    this.activeTerrainBrushStroke = null;
     this.currentDocument = document;
     this.currentSelection = selection;
     this.currentActiveSelectionId = activeSelectionId;
@@ -779,6 +780,7 @@ export class ViewportHost {
     this.rebuildModelInstances(document, selection);
     this.applyTransformPreview();
     this.syncTransformGizmo();
+    this.syncTerrainBrushPreview();
   }
 
   updateAssets(