diff --git a/repos/base-hw/src/core/kernel/cpu.cc b/repos/base-hw/src/core/kernel/cpu.cc
index 0d1d9e9aef..0e3941722f 100644
--- a/repos/base-hw/src/core/kernel/cpu.cc
+++ b/repos/base-hw/src/core/kernel/cpu.cc
@@ -85,6 +85,8 @@ Cpu_context::Cpu_context(Cpu           &cpu,
 
 Cpu_context::~Cpu_context()
 {
+	assert(_cpu().id() == Cpu::executing_id() ||
+	       &_cpu().current_context() != this);
 	_cpu().scheduler().remove(*this);
 }