diff --git a/packages/element/src/linearElementEditor.ts b/packages/element/src/linearElementEditor.ts
index c1a0dd5fe9..acd8b553b7 100644
--- a/packages/element/src/linearElementEditor.ts
+++ b/packages/element/src/linearElementEditor.ts
@@ -457,17 +457,7 @@ export class LinearElementEditor {
 
       deltaX = target[0] - draggingPoint[0];
       deltaY = target[1] - draggingPoint[1];
-    } else if (
-      // shouldAllowDraggingPoint(
-      //   element,
-      //   scenePointerX,
-      //   scenePointerY,
-      //   selectedPointsIndices,
-      //   elementsMap,
-      //   app,
-      // )
-      true
-    ) {
+    } else {
       const newDraggingPointPosition = LinearElementEditor.createPointAt(
         element,
         elementsMap,
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
index 9b6e9195f8..880a6191d5 100644
--- a/packages/excalidraw/components/App.tsx
+++ b/packages/excalidraw/components/App.tsx
@@ -6208,7 +6208,7 @@ class App extends React.Component<AppProps, AppState> {
       // Hovering with a selected tool or creating new linear element via click
       // and point
       const { newElement } = this.state;
-      if (isBindingElement(newElement, false)) {
+      if (isBindingElement(newElement, false) && isBindingEnabled(this.state)) {
         this.setState({
           suggestedBinding: maybeSuggestBindingsForBindingElementAtCoords(
             newElement,
@@ -6217,8 +6217,6 @@ class App extends React.Component<AppProps, AppState> {
             pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
           ),
         });
-      } else {
-        this.maybeSuggestBindingAtCursor(scenePointer);
       }
     }
 
@@ -8280,11 +8278,13 @@ class App extends React.Component<AppProps, AppState> {
         pointerDownState.origin.y,
       );
       const elementsMap = this.scene.getNonDeletedElementsMap();
-      const boundElement = getHoveredElementForBinding(
-        point,
-        this.scene.getNonDeletedElements(),
-        elementsMap,
-      );
+      const boundElement = isBindingEnabled(this.state)
+        ? getHoveredElementForBinding(
+            point,
+            this.scene.getNonDeletedElements(),
+            elementsMap,
+          )
+        : null;
 
       this.scene.mutateElement(element, {
         points: [pointFrom<LocalPoint>(0, 0), pointFrom<LocalPoint>(0, 0)],
@@ -10703,20 +10703,6 @@ class App extends React.Component<AppProps, AppState> {
     }
   };
 
-  private maybeSuggestBindingAtCursor = (pointerCoords: {
-    x: number;
-    y: number;
-  }): void => {
-    const hoveredBindableElement = getHoveredElementForBinding(
-      pointFrom<GlobalPoint>(pointerCoords.x, pointerCoords.y),
-      this.scene.getNonDeletedElements(),
-      this.scene.getNonDeletedElementsMap(),
-    );
-    this.setState({
-      suggestedBinding: hoveredBindableElement ?? null,
-    });
-  };
-
   private clearSelection(hitElement: ExcalidrawElement | null): void {
     this.setState((prevState) => ({
       selectedElementIds: makeNextSelectedElementIds({}, prevState),