diff --git a/kernel/cpu.c b/kernel/cpu.c
index d851df22f5c5eef24b9f4e3ead6e986e4b87352f..04892a82f6ac36c92324806b66a1c1855880c8f7 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -632,6 +632,11 @@ cpuhp_invoke_ap_callback(int cpu, enum cpuhp_state state, bool bringup,
 		__cpuhp_kick_ap(st);
 	}
 
+	/*
+	 * Clean up the leftovers so the next hotplug operation wont use stale
+	 * data.
+	 */
+	st->node = st->last = NULL;
 	return ret;
 }