diff --git a/lib/VM/Profiler/SamplingProfilerPosix.cpp b/lib/VM/Profiler/SamplingProfilerPosix.cpp
index 065606d6fe9..899ff54cccb 100644
--- a/lib/VM/Profiler/SamplingProfilerPosix.cpp
+++ b/lib/VM/Profiler/SamplingProfilerPosix.cpp
@@ -482,6 +482,7 @@ void SamplingProfiler::setRuntimeThread() {
   std::lock_guard<std::mutex> lock(profiler->runtimeDataLock_);
   profiler->currentThread_ = pthread_self();
   threadID_ = oscompat::global_thread_id();
+  threadNames_[threadID_] = oscompat::thread_name();
 }
 
 } // namespace vm
diff --git a/lib/VM/Profiler/SamplingProfilerWindows.cpp b/lib/VM/Profiler/SamplingProfilerWindows.cpp
index 89fdbcb1771..72357779690 100644
--- a/lib/VM/Profiler/SamplingProfilerWindows.cpp
+++ b/lib/VM/Profiler/SamplingProfilerWindows.cpp
@@ -223,6 +223,7 @@ void SamplingProfiler::setRuntimeThread() {
   CloseHandle(profiler->currentThread_);
   profiler->currentThread_ = openCurrentThread();
   threadID_ = oscompat::global_thread_id();
+  threadNames_[threadID_] = oscompat::thread_name();
 }
 
 } // namespace vm