diff --git a/src/gpuvis_graph.cpp b/src/gpuvis_graph.cpp
index 452268fd..10196b33 100644
--- a/src/gpuvis_graph.cpp
+++ b/src/gpuvis_graph.cpp
@@ -2501,6 +2501,10 @@ uint32_t TraceWin::graph_render_i915_perf_events( graph_info_t &gi )
         }
         const trace_event_t &event = get_event( eventid );
 
+        // Skip idle events
+        if ( event.pid == 0xffffffff )
+            continue;
+
         if ( eventid > gi.eventend )
             break;
         else if ( gi.graph_only_filtered && event.is_filtered_out )
diff --git a/src/i915-perf/i915-perf-read.cpp b/src/i915-perf/i915-perf-read.cpp
index 20df6bff..7e41f906 100644
--- a/src/i915-perf/i915-perf-read.cpp
+++ b/src/i915-perf/i915-perf-read.cpp
@@ -75,10 +75,6 @@ int read_i915_perf_file( const char *file, StrPool &strpool, trace_info_t &trace
 
     for (uint32_t i = 0; i < reader->n_timelines; i++)
     {
-        // Skip the idle time
-        if ( reader->timelines[i].hw_id == 0xffffffff )
-            continue;
-
         trace_event_t event;
 
         if ( reader->timelines[i].cpu_ts_start < trace_info.min_file_ts )