diff --git a/packages/element/src/binding.ts b/packages/element/src/binding.ts
index 66c316129a..37a097d945 100644
--- a/packages/element/src/binding.ts
+++ b/packages/element/src/binding.ts
@@ -671,11 +671,6 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
       otherBindableElement,
       elementsMap,
     );
-  // const otherPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-  //   arrow,
-  //   startDragged ? -1 : 0,
-  //   elementsMap,
-  // );
   const otherFocusPointIsInElement =
     otherBindableElement &&
     otherFocusPoint &&
@@ -683,11 +678,6 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
 
   // Handle outside-outside binding to the same element
   if (otherBinding && otherBinding.elementId === hit?.id) {
-    // const [startFixedPoint, endFixedPoint] = getGlobalFixedPoints(
-    //   arrow,
-    //   elementsMap,
-    // );
-
     invariant(
       !opts?.newArrow || appState.selectedLinearElement?.initialState.origin,
       "appState.selectedLinearElement.initialState.origin must be defined for new arrows",
diff --git a/packages/element/src/linearElementEditor.ts b/packages/element/src/linearElementEditor.ts
index e8b089cf46..946bd33a97 100644
--- a/packages/element/src/linearElementEditor.ts
+++ b/packages/element/src/linearElementEditor.ts
@@ -392,6 +392,7 @@ export class LinearElementEditor {
     // PERF: Avoid state updates if not absolutely necessary
     if (
       app.state.selectedLinearElement?.customLineAngle === customLineAngle &&
+      linearElementEditor.initialState.altFocusPoint &&
       (!suggestedBinding ||
         isShallowEqual(app.state.suggestedBinding ?? [], suggestedBinding))
     ) {