diff --git a/src/runtime/internal/scheduler.ts b/src/runtime/internal/scheduler.ts
index b0db71035a..747e796c93 100644
--- a/src/runtime/internal/scheduler.ts
+++ b/src/runtime/internal/scheduler.ts
@@ -14,7 +14,10 @@ let update_scheduled = false;
 export function schedule_update() {
 	if (!update_scheduled) {
 		update_scheduled = true;
-		resolved_promise.then(flush);
+		resolved_promise.then(() => {
+			flush();
+			set_current_component(null);
+		});
 	}
 }