diff --git a/cpumf/lshwc.c b/cpumf/lshwc.c
index d4cd6265..e6faf509 100644
--- a/cpumf/lshwc.c
+++ b/cpumf/lshwc.c
@@ -245,12 +245,12 @@ static void parse_cpulist(char *parm, struct s390_hwctr_start *start)
 			start->counter_sets = parse_ctrset(++cp);
 		}
 
-		if (strlen(parm) > 0) {		/* Handle CPU list */
+		if (strlen(parm) > 0)		/* Handle CPU list */
 			rc = libcpumf_cpuset(parm, &cpulist);
-			if (rc)
-				errx(EXIT_FAILURE, "Cannot use CPU list %s",
-				     parm);
-		}
+		else
+			rc = libcpumf_cpuset_fn(S390_CPUS_ONLINE, &cpulist);
+		if (rc)
+			errx(EXIT_FAILURE, "Cannot use CPU list %s", parm);
 	} else {		/* No CPU list and no counter sets */
 		rc = libcpumf_cpuset_fn(S390_CPUS_ONLINE, &cpulist);
 		if (rc)