diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index 1eb993c6271e..d456579d0952 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -713,6 +713,7 @@ skip_wait:
 
 err:
 	__set_current_state(TASK_RUNNING);
+	__mutex_remove_waiter(lock, &waiter);
 err_early_kill:
 	raw_spin_unlock(&lock->wait_lock);
 	debug_mutex_free_waiter(&waiter);