diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index 683c71f582..777dff2211 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -3844,10 +3844,14 @@ int Process::sys$join_thread(int tid, void** exit_value)
         if (result == Thread::BlockResult::InterruptedByDeath) {
             // NOTE: This cleans things up so that Thread::finalize() won't
             //       get confused about a missing joiner when finalizing the joinee.
-            InterruptDisabler disabler;
-            Thread::current->m_joinee->m_joiner = nullptr;
-            Thread::current->m_joinee = nullptr;
-            return 0;
+            InterruptDisabler disabler_t;
+
+            if (Thread::current->m_joinee) {
+                Thread::current->m_joinee->m_joiner = nullptr;
+                Thread::current->m_joinee = nullptr;
+            }
+
+            break;
         }
     }
 
diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp
index cb20b00083..4502cd569a 100644
--- a/Kernel/Thread.cpp
+++ b/Kernel/Thread.cpp
@@ -300,6 +300,7 @@ void Thread::finalize()
     if (m_joiner) {
         ASSERT(m_joiner->m_joinee == this);
         static_cast<JoinBlocker*>(m_joiner->m_blocker)->set_joinee_exit_value(m_exit_value);
+        static_cast<JoinBlocker*>(m_joiner->m_blocker)->set_interrupted_by_death();
         m_joiner->m_joinee = nullptr;
         // NOTE: We clear the joiner pointer here as well, to be tidy.
         m_joiner = nullptr;