diff --git a/src/system/kernel/system_info.cpp b/src/system/kernel/system_info.cpp
index 71e27ec273..554a88a861 100644
--- a/src/system/kernel/system_info.cpp
+++ b/src/system/kernel/system_info.cpp
@@ -493,12 +493,12 @@ get_system_info(system_info* info)
 status_t
 get_cpu_info(uint32 firstCPU, uint32 cpuCount, cpu_info* info)
 {
+	if (cpuCount == 0)
+		return B_OK;
 	if (firstCPU >= (uint32)smp_get_num_cpus())
 		return B_BAD_VALUE;
 
 	uint32 count = std::min(cpuCount, smp_get_num_cpus() - firstCPU);
-	if (count <= 0)
-		return B_OK;
 
 	// This function is called very often from userland by applications
 	// that display CPU usage information, so we want to keep this as