diff --git a/src/runtime/internal/scheduler.ts b/src/runtime/internal/scheduler.ts
index b0db71035a..568739e4f8 100644
--- a/src/runtime/internal/scheduler.ts
+++ b/src/runtime/internal/scheduler.ts
@@ -45,6 +45,7 @@ export function flush() {
 			set_current_component(component);
 			update(component.$$);
 		}
+		set_current_component(null);
 
 		dirty_components.length = 0;
 
diff --git a/test/runtime/samples/onmount-get-current-component/_config.js b/test/runtime/samples/onmount-get-current-component/_config.js
new file mode 100644
index 0000000000..727f8a2d8e
--- /dev/null
+++ b/test/runtime/samples/onmount-get-current-component/_config.js
@@ -0,0 +1,4 @@
+export default {
+	skip_if_ssr: true,
+	html: `1`,
+};
diff --git a/test/runtime/samples/onmount-get-current-component/main.svelte b/test/runtime/samples/onmount-get-current-component/main.svelte
new file mode 100644
index 0000000000..de64bc65fa
--- /dev/null
+++ b/test/runtime/samples/onmount-get-current-component/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	import { onMount } from 'svelte';
+	import { get_current_component } from 'svelte/internal';
+
+	let gotException = 0;
+
+	onMount(() => {
+		try {
+			get_current_component();
+		} catch (error) {
+			gotException++;
+		}
+	});
+</script>
+
+{gotException}