diff --git a/server/TracyTimelineItemCpuData.cpp b/server/TracyTimelineItemCpuData.cpp
index 35d9e97c..fc15df2e 100644
--- a/server/TracyTimelineItemCpuData.cpp
+++ b/server/TracyTimelineItemCpuData.cpp
@@ -41,7 +41,8 @@ int64_t TimelineItemCpuData::RangeEnd() const
 
 bool TimelineItemCpuData::DrawContents( const TimelineContext& ctx, int& offset )
 {
-    m_view.DrawCpuData( ctx, m_cpuDraw, m_ctxDraw, offset );
+    const bool hasCpuData = m_worker.IsCpuUsageReady() && !m_worker.GetCpuUsage().empty();
+    m_view.DrawCpuData( ctx, m_cpuDraw, m_ctxDraw, offset, hasCpuData );
     return true;
 }
 
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index 1fc14c9f..3a7c158a 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -133,7 +133,7 @@ public:
     void DrawThreadMessagesList( const TimelineContext& ctx, const std::vector<MessagesDraw>& drawList, int offset, uint64_t tid );
     void DrawThreadOverlays( const ThreadData& thread, const ImVec2& ul, const ImVec2& dr );
     bool DrawGpu( const TimelineContext& ctx, const GpuCtxData& gpu, int& offset );
-    bool DrawCpuData( const TimelineContext& ctx, const std::vector<CpuUsageDraw>& cpuDraw, const std::vector<std::vector<CpuCtxDraw>>& ctxDraw, int& offset );
+    bool DrawCpuData( const TimelineContext& ctx, const std::vector<CpuUsageDraw>& cpuDraw, const std::vector<std::vector<CpuCtxDraw>>& ctxDraw, int& offset, bool hasCpuData );
 
     bool m_showRanges = false;
     Range m_statRange;
diff --git a/server/TracyView_CpuData.cpp b/server/TracyView_CpuData.cpp
index 2e70aece..11fd9454 100644
--- a/server/TracyView_CpuData.cpp
+++ b/server/TracyView_CpuData.cpp
@@ -14,7 +14,7 @@ constexpr float MinVisSize = 3;
 namespace tracy
 {
 
-bool View::DrawCpuData( const TimelineContext& ctx, const std::vector<CpuUsageDraw>& cpuDraw, const std::vector<std::vector<CpuCtxDraw>>& ctxDraw, int& offset )
+bool View::DrawCpuData( const TimelineContext& ctx, const std::vector<CpuUsageDraw>& cpuDraw, const std::vector<std::vector<CpuCtxDraw>>& ctxDraw, int& offset, bool hasCpuData )
 {
     auto cpuData = m_worker.GetCpuData();
     const auto cpuCnt = m_worker.GetCpuDataCpuCount();
@@ -34,7 +34,7 @@ bool View::DrawCpuData( const TimelineContext& ctx, const std::vector<CpuUsageDr
 
     auto draw = ImGui::GetWindowDrawList();
 
-    if( m_vd.drawCpuUsageGraph && !cpuDraw.empty() )
+    if( hasCpuData && m_vd.drawCpuUsageGraph )
     {
         const auto cpuUsageHeight = floor( 30.f * GetScale() );
         if( wpos.y + offset + cpuUsageHeight + 3 >= yMin && wpos.y + offset <= yMax )