diff --git a/src/system/kernel/thread.cpp b/src/system/kernel/thread.cpp
index a786609043..43e69d3350 100644
--- a/src/system/kernel/thread.cpp
+++ b/src/system/kernel/thread.cpp
@@ -2563,6 +2563,9 @@ wait_for_thread_etc(thread_id id, uint32 flags, bigtime_t timeout,
 			// middle of the cleanup.
 			acquire_sem(exitSem);
 			status = B_OK;
+
+			if (_returnCode != NULL)
+				*_returnCode = death.status;
 		}
 	}