diff --git a/pkg/subctl/cmd/diagnose/all.go b/pkg/subctl/cmd/diagnose/all.go
index 192cc5c50..fa0172af7 100644
--- a/pkg/subctl/cmd/diagnose/all.go
+++ b/pkg/subctl/cmd/diagnose/all.go
@@ -47,25 +47,25 @@ func diagnoseAll(cluster *cmd.Cluster) bool {
 		return success
 	}
 
-	success = success && checkCNIConfig(cluster)
+	success = checkCNIConfig(cluster) && success
 	fmt.Println()
 
-	success = success && checkConnections(cluster)
+	success = checkConnections(cluster) && success
 	fmt.Println()
 
-	success = success && checkPods(cluster)
+	success = checkPods(cluster) && success
 	fmt.Println()
 
-	success = success && checkOverlappingCIDRs(cluster)
+	success = checkOverlappingCIDRs(cluster) && success
 	fmt.Println()
 
-	success = success && checkKubeProxyMode(cluster)
+	success = checkKubeProxyMode(cluster) && success
 	fmt.Println()
 
-	success = success && checkFirewallMetricsConfig(cluster)
+	success = checkFirewallMetricsConfig(cluster) && success
 	fmt.Println()
 
-	success = success && checkVxLANConfig(cluster)
+	success = checkVxLANConfig(cluster) && success
 	fmt.Println()
 
 	fmt.Printf("Skipping tunnel firewall check as it requires two kubeconfigs." +
diff --git a/pkg/subctl/cmd/execute.go b/pkg/subctl/cmd/execute.go
index 36f1cb009..f78e86c7d 100644
--- a/pkg/subctl/cmd/execute.go
+++ b/pkg/subctl/cmd/execute.go
@@ -99,7 +99,7 @@ func ExecuteMultiCluster(run func(*Cluster) bool) {
 			continue
 		}
 
-		success = success && run(cluster)
+		success = run(cluster) && success
 		fmt.Println()
 	}