diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index e2c95751..07a94801 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -1979,10 +1979,20 @@ void View::DrawZones()
         }
     }
 
-    auto& crash = m_worker.GetCrashEvent();
     // zones
+    const auto& threadData = m_worker.GetThreadData();
+    if( threadData.size() != m_threadOrder.size() )
+    {
+        m_threadOrder.reserve( threadData.size() );
+        for( int i=m_threadOrder.size(); i<threadData.size(); i++ )
+        {
+            m_threadOrder.push_back( threadData[i] );
+        }
+    }
+
+    auto& crash = m_worker.GetCrashEvent();
     LockHighlight nextLockHighlight { -1 };
-    for( const auto& v : m_worker.GetThreadData() )
+    for( const auto& v : m_threadOrder )
     {
         auto& vis = Vis( v );
         if( !vis.visible )
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index e6dd7000..9a649117 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -193,6 +193,7 @@ private:
     flat_hash_map<uint64_t, bool, nohash<uint64_t>> m_visibleMsgThread;
     flat_hash_map<const void*, int, nohash<const void*>> m_gpuDrift;
     flat_hash_map<const PlotData*, PlotView, nohash<const PlotData*>> m_plotView;
+    Vector<const ThreadData*> m_threadOrder;
 
     tracy_force_inline VisData& Vis( const void* ptr )
     {