diff --git a/pkg/cluster/operation/check.go b/pkg/cluster/operation/check.go
index 032f5b20e4..903c540563 100644
--- a/pkg/cluster/operation/check.go
+++ b/pkg/cluster/operation/check.go
@@ -224,10 +224,23 @@ func checkCPU(opt *CheckOptions, cpuInfo *sysinfo.CPU) []*CheckResult {
 	}
 
 	// check for CPU frequency governor
-	if cpuInfo.Governor != "" && cpuInfo.Governor != "performance" {
+	if cpuInfo.Governor != "" {
+		if cpuInfo.Governor != "performance" {
+			results = append(results, &CheckResult{
+				Name: CheckNameCPUGovernor,
+				Err:  fmt.Errorf("CPU frequency governor is %s, should use performance", cpuInfo.Governor),
+			})
+		} else {
+			results = append(results, &CheckResult{
+				Name: CheckNameCPUGovernor,
+				Msg:  fmt.Sprintf("CPU frequency governor is %s", cpuInfo.Governor),
+			})
+		}
+	} else {
 		results = append(results, &CheckResult{
 			Name: CheckNameCPUGovernor,
-			Err:  fmt.Errorf("CPU frequency governor is %s, should use performance", cpuInfo.Governor),
+			Err:  fmt.Errorf("Unable to determine current CPU frequency governor policy"),
+			Warn: true,
 		})
 	}