diff --git a/packages/core/src/composables/useDrag.ts b/packages/core/src/composables/useDrag.ts
index a14579d8..be955b7a 100644
--- a/packages/core/src/composables/useDrag.ts
+++ b/packages/core/src/composables/useDrag.ts
@@ -93,6 +93,8 @@ function useDrag(params: UseDragParams) {
                   getNode: $$(getNode),
                 })
                 onStart(event.sourceEvent, currentNode, nodes)
+
+                dragging.value = true
               }
             })
             .on('drag', (event: UseDragEvent) => {
@@ -115,7 +117,6 @@ function useDrag(params: UseDragParams) {
                 )
 
                 updateNodePositions(dragItems, true, true)
-                dragging.value = true
 
                 if (onDrag) {
                   const [currentNode, nodes] = getEventHandlerParams({
@@ -142,6 +143,9 @@ function useDrag(params: UseDragParams) {
                 }
               })
             })
+            .on('end', () => {
+              dragging.value = false
+            })
             .filter((event: D3DragEvent<HTMLDivElement, null, SubjectPosition>['sourceEvent']) => {
               const target = event.target as HTMLDivElement
               return (