diff --git a/src/system/kernel/scheduler/scheduler.cpp b/src/system/kernel/scheduler/scheduler.cpp
index fff4707823..5c2568d9b6 100644
--- a/src/system/kernel/scheduler/scheduler.cpp
+++ b/src/system/kernel/scheduler/scheduler.cpp
@@ -24,6 +24,9 @@ static void (*sRescheduleFunction)(void);
 static void
 scheduler_reschedule_no_op(void)
 {
+	struct thread* thread = thread_get_current_thread();
+	if (thread != NULL && thread->next_state != B_THREAD_READY)
+		panic("scheduler_reschedule_no_op() called in non-ready thread");
 }