diff --git a/packages/svelte/src/internal/client/dom/elements/events.js b/packages/svelte/src/internal/client/dom/elements/events.js
index 0d30d4bbce..e5711a203a 100644
--- a/packages/svelte/src/internal/client/dom/elements/events.js
+++ b/packages/svelte/src/internal/client/dom/elements/events.js
@@ -56,18 +56,27 @@ export function replay_events(dom) {
  * @param {AddEventListenerOptions} [options]
  */
 export function create_event(event_name, dom, handler, options = {}) {
+	var boundary_effect = (active_effect !== null && get_boundary(active_effect)) ?? null;
 	/**
 	 * @this {EventTarget}
 	 */
 	function target_handler(/** @type {Event} */ event) {
-		if (!options.capture) {
-			// Only call in the bubble phase, else delegated events would be called before the capturing events
-			handle_event_propagation.call(dom, event);
-		}
-		if (!event.cancelBubble) {
-			return without_reactive_context(() => {
-				return handler?.call(this, event);
-			});
+		var previous_boundary_effect = event_boundary_effect;
+		try {
+			if (boundary_effect !== null) {
+				set_event_boundary_effect(boundary_effect);
+			}
+			if (!options.capture) {
+				// Only call in the bubble phase, else delegated events would be called before the capturing events
+				handle_event_propagation.call(dom, event);
+			}
+			if (!event.cancelBubble) {
+				return without_reactive_context(() => {
+					return handler?.call(this, event);
+				});
+			}
+		} finally {
+			set_event_boundary_effect(previous_boundary_effect)
 		}
 	}
 
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 207d8fa06a..f24eb5e904 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -289,7 +289,7 @@ export function mark_reactions(signal, status, source) {
 		// If the signal a) was previously clean or b) is an unowned derived, then mark it
 		if ((flags & (CLEAN | UNOWNED)) !== 0) {
 			if ((flags & DERIVED) !== 0) {
-				mark_reactions(/** @type {Derived} */ (reaction), MAYBE_DIRTY);
+				mark_reactions(/** @type {Derived} */ (reaction), MAYBE_DIRTY, source);
 			} else {
 				schedule_effect(/** @type {Effect} */ (reaction), source);
 			}