diff --git a/kernel/cpu.c b/kernel/cpu.c
index 920864f..5b6e550 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -234,6 +234,8 @@
 		return err;
 
 	cpu_notify(CPU_DYING | param->mod, param->hcpu);
+	/* Park the stopper thread */
+	kthread_park(current);
 	return 0;
 }