diff --git a/kernel/kernel/Thread.cpp b/kernel/kernel/Thread.cpp
index baadcd9d..5d7208c4 100644
--- a/kernel/kernel/Thread.cpp
+++ b/kernel/kernel/Thread.cpp
@@ -623,6 +623,9 @@ namespace Kernel
 			{
 				Processor::set_interrupt_state(InterruptState::Disabled);
 				setup_process_cleanup();
+				// This is super hacky but prevents a crash in yield :D
+				if (m_signal_lock.current_processor_has_lock())
+					m_signal_lock.unlock(InterruptState::Disabled);
 				Processor::yield();
 				ASSERT_NOT_REACHED();
 			}