diff --git a/server/TracyTimelineItemCpuData.cpp b/server/TracyTimelineItemCpuData.cpp
index 619e8ba6..d3b320b8 100644
--- a/server/TracyTimelineItemCpuData.cpp
+++ b/server/TracyTimelineItemCpuData.cpp
@@ -41,8 +41,7 @@ int64_t TimelineItemCpuData::RangeEnd() const
 
 bool TimelineItemCpuData::DrawContents( const TimelineContext& ctx, int& offset )
 {
-    const bool hasCpuData = m_worker.IsCpuUsageReady() && !m_worker.GetCpuUsage().empty();
-    m_view.DrawCpuData( ctx, m_cpuDraw, m_ctxDraw, offset, hasCpuData );
+    m_view.DrawCpuData( ctx, m_cpuDraw, m_ctxDraw, offset, m_hasCpuData );
     return true;
 }
 
@@ -66,6 +65,8 @@ void TimelineItemCpuData::Preprocess( const TimelineContext& ctx, TaskDispatch&
     const auto ostep = ty + 1;
     const auto sstep = sty + 1;
 
+    m_hasCpuData = false;
+
     auto pos = yPos + ostep;
 
 #ifdef TRACY_NO_STATISTICS
@@ -160,6 +161,7 @@ void TimelineItemCpuData::PreprocessCpuUsage( const TimelineContext& ctx )
     auto& ctxUsage = m_worker.GetCpuUsage();
     if( !ctxUsage.empty() )
     {
+        m_hasCpuData = true;
         auto itBegin = ctxUsage.begin();
         for( size_t i=0; i<num; i++ )
         {
@@ -202,6 +204,7 @@ void TimelineItemCpuData::PreprocessCpuUsage( const TimelineContext& ctx )
             auto& cs = cpuData[i].cs;
             if( !cs.empty() )
             {
+                m_hasCpuData = true;
                 auto itBegin = cs.begin();
                 auto ptr = m_cpuDraw.data();
                 for( size_t i=0; i<num; i++ )
diff --git a/server/TracyTimelineItemCpuData.hpp b/server/TracyTimelineItemCpuData.hpp
index 7d6b707f..8cfb1089 100644
--- a/server/TracyTimelineItemCpuData.hpp
+++ b/server/TracyTimelineItemCpuData.hpp
@@ -38,6 +38,8 @@ private:
 
     std::vector<CpuUsageDraw> m_cpuDraw;
     std::vector<std::vector<CpuCtxDraw>> m_ctxDraw;
+
+    bool m_hasCpuData;
 };
 
 }