diff --git a/tools/runqlat.py b/tools/runqlat.py
index 850aaafdb67b..085543c2b943 100755
--- a/tools/runqlat.py
+++ b/tools/runqlat.py
@@ -90,7 +90,7 @@
 // record enqueue timestamp
 static int trace_enqueue(u32 tgid, u32 pid)
 {
-    if (FILTER)
+    if (FILTER || pid == 0)
         return 0;
     u64 ts = bpf_ktime_get_ns();
     start.update(&pid, &ts);
@@ -119,7 +119,7 @@
     if (prev->state == TASK_RUNNING) {
         tgid = prev->tgid;
         pid = prev->pid;
-        if (!(FILTER)) {
+        if (!(FILTER || pid == 0)) {
             u64 ts = bpf_ktime_get_ns();
             start.update(&pid, &ts);
         }
@@ -127,7 +127,7 @@
 
     tgid = bpf_get_current_pid_tgid() >> 32;
     pid = bpf_get_current_pid_tgid();
-    if (FILTER)
+    if (FILTER || pid == 0)
         return 0;
     u64 *tsp, delta;
 
@@ -183,7 +183,7 @@
     if (state == TASK_RUNNING) {
         bpf_probe_read(&tgid, sizeof(prev->tgid), &prev->tgid);
         bpf_probe_read(&pid, sizeof(prev->pid), &prev->pid);
-        if (!(FILTER)) {
+        if (!(FILTER || pid == 0)) {
             u64 ts = bpf_ktime_get_ns();
             start.update(&pid, &ts);
         }
@@ -191,7 +191,7 @@
 
     bpf_probe_read(&tgid, sizeof(next->tgid), &next->tgid);
     bpf_probe_read(&pid, sizeof(next->pid), &next->pid);
-    if (FILTER)
+    if (FILTER || pid == 0)
         return 0;
     u64 *tsp, delta;
 
diff --git a/tools/runqslower.py b/tools/runqslower.py
index 3ec898b4c2de..a28a823387cc 100755
--- a/tools/runqslower.py
+++ b/tools/runqslower.py
@@ -77,7 +77,7 @@
 // record enqueue timestamp
 static int trace_enqueue(u32 tgid, u32 pid)
 {
-    if (FILTER_PID)
+    if (FILTER_PID || pid == 0)
         return 0;
     u64 ts = bpf_ktime_get_ns();
     start.update(&pid, &ts);
@@ -106,7 +106,7 @@
     if (prev->state == TASK_RUNNING) {
         tgid = prev->tgid;
         pid = prev->pid;
-        if (!(FILTER_PID)) {
+        if (!(FILTER_PID || pid == 0)) {
             u64 ts = bpf_ktime_get_ns();
             start.update(&pid, &ts);
         }
@@ -176,7 +176,7 @@
     if (state == TASK_RUNNING) {
         bpf_probe_read(&tgid, sizeof(prev->tgid), &prev->tgid);
         bpf_probe_read(&pid, sizeof(prev->pid), &prev->pid);
-        if (!(FILTER_PID)) {
+        if (!(FILTER_PID || pid == 0)) {
             u64 ts = bpf_ktime_get_ns();
             start.update(&pid, &ts);
         }