diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index 70a3de11..9bfaa78e 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Patch changes
 
 - fix `OnNodeDrag` type
+- refactor(handles): do not use fallback handle if an id is being used #3409
 
 ## 12.0.0-next.7
 
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 6b9e940a..23b550ea 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -9,6 +9,7 @@
 ## Patch changes
 
 - Edge label has a default background and is clickable
+- refactor(handles): do not use fallback handle if an id is being used #3409
 
 ## 0.0.34
 
diff --git a/packages/system/src/utils/edges/positions.ts b/packages/system/src/utils/edges/positions.ts
index 59b8cd42..8bb9f5df 100644
--- a/packages/system/src/utils/edges/positions.ts
+++ b/packages/system/src/utils/edges/positions.ts
@@ -114,11 +114,6 @@ function getHandle(bounds: HandleElement[], handleId?: string | null): HandleEle
     return null;
   }
 
-  if (bounds.length === 1 || !handleId) {
-    return bounds[0];
-  } else if (handleId) {
-    return bounds.find((d) => d.id === handleId) || null;
-  }
-
-  return null;
+  // if no handleId is given, we use the first handle, otherwise we check for the id
+  return (!handleId ? bounds[0] : bounds.find((d) => d.id === handleId)) || null;
 }