diff --git a/packages/core/src/utils/createExtendedEventHook.ts b/packages/core/src/utils/createExtendedEventHook.ts
index 44b1767d..b88e54be 100644
--- a/packages/core/src/utils/createExtendedEventHook.ts
+++ b/packages/core/src/utils/createExtendedEventHook.ts
@@ -33,7 +33,14 @@ export function createExtendedEventHook<T = any>(defaultHandler?: (param: T) =>
     }
 
     fns.add(fn)
-    const offFn = () => off(fn)
+
+    const offFn = () => {
+      off(fn)
+
+      if (defaultHandler && hasDefaultHandler) {
+        fns.add(defaultHandler)
+      }
+    }
 
     tryOnScopeDispose(offFn)