diff --git a/base/src/base/thread/thread_start.cc b/base/src/base/thread/thread_start.cc
index 17e040cb0..1eec30546 100644
--- a/base/src/base/thread/thread_start.cc
+++ b/base/src/base/thread/thread_start.cc
@@ -38,6 +38,9 @@ void Thread_base::_thread_start()
 
 void Thread_base::_deinit_platform_thread()
 {
+	if (!_cpu_session)
+		_cpu_session = env()->cpu_session();
+
 	_cpu_session->kill_thread(_thread_cap);
 }