diff --git a/app/src/modules/builder/groups/floorPlanGroup.tsx b/app/src/modules/builder/groups/floorPlanGroup.tsx
index 28b6e6c..c1c38f0 100644
--- a/app/src/modules/builder/groups/floorPlanGroup.tsx
+++ b/app/src/modules/builder/groups/floorPlanGroup.tsx
@@ -31,7 +31,15 @@ const FloorPlanGroup = ({ floorPlanGroup, floorPlanGroupLine, floorPlanGroupPoin
     const { socket } = useSocketStore();
 
     useEffect(() => {
-        addDragControl(dragPointControls, currentLayerPoint, state, floorPlanGroupPoint, floorPlanGroupLine, lines, onlyFloorlines, socket);
+        if (toolMode === 'move') {
+            addDragControl(dragPointControls, currentLayerPoint, state, floorPlanGroupPoint, floorPlanGroupLine, lines, onlyFloorlines, socket);
+        }
+
+        return () => {
+            if (dragPointControls.current) {
+                dragPointControls.current.enabled = false;
+            }
+        };
     }, [toolMode, state]);
 
     useEffect(() => {