diff --git a/cmd/common.go b/cmd/common.go
index 9e29edec9ebc5333ee3edd7178407469422c8845..2d6463c5cc224705bd3b4fb10a1c1a91e80d588d 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -202,9 +202,15 @@ func isMaster() bool {
 	_ = loadConfig(check.MASTER)
 	glog.V(2).Info("Checking if the current node is running master components")
 	masterConf := viper.Sub(string(check.MASTER))
-	if _, err := getBinaries(masterConf); err != nil {
+	components, err := getBinaries(masterConf)
+
+	if err != nil {
 		glog.V(2).Info(err)
 		return false
 	}
+	if len(components) == 0 {
+		glog.V(2).Info("No master binaries specified")
+		return false
+	}
 	return true
 }