diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 24e5da46..4350968b 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -4406,7 +4406,8 @@ int View::DrawCpuData( int offset, double pxns, const ImVec2& wpos, bool hover,
 
         const auto origOffset = offset;
         auto cpuData = m_worker.GetCpuData();
-        for( int i=0; i<256; i++ )
+        const auto cpuCnt = m_worker.GetCpuDataCpuCount();
+        for( int i=0; i<cpuCnt; i++ )
         {
             if( !cpuData[i].cs.empty() )
             {
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index d2a4971b..51087456 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -1830,7 +1830,7 @@ uint64_t Worker::GetContextSwitchCount() const
 uint64_t Worker::GetContextSwitchPerCpuCount() const
 {
     uint64_t cnt = 0;
-    for( int i=0; i<256; i++ )
+    for( int i=0; i<m_data.cpuDataCount; i++ )
     {
         cnt += m_data.cpuData[i].cs.size();
     }