diff --git a/src/hooks/useTrackpadGesture.ts b/src/hooks/useTrackpadGesture.ts
index 66f801d8..9fb1583a 100644
--- a/src/hooks/useTrackpadGesture.ts
+++ b/src/hooks/useTrackpadGesture.ts
@@ -1,4 +1,4 @@
-import { useRef, useState } from "react"
+import { useEffect, useRef, useState } from "react"
 import {
 	PINCH_THRESHOLD,
 	TOUCH_MOVE_THRESHOLD,
@@ -254,6 +254,16 @@ export const useTrackpadGesture = (
 		}
 	}
 
+	// Cleanup: clear any pending drag timeout on unmount
+	useEffect(() => {
+		return () => {
+			if (draggingTimeout.current) {
+				clearTimeout(draggingTimeout.current)
+				draggingTimeout.current = null
+			}
+		}
+	}, [])
+
 	return {
 		isTracking,
 		handlers: {