diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 80ab942afa8ab03d0b8a43c0acf9580908f1d443..3b9f411a6b461272903e9b8559ada718d2e57867 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1119,7 +1119,8 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,
 
 		evsel->threads = thread_map__get(evlist->threads);
 
-		if (!evsel->cpus || !evsel->threads)
+		if ((evlist->cpus && !evsel->cpus) ||
+		    (evlist->threads && !evsel->threads))
 			return -ENOMEM;
 	}