diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go
index da812dc22..d76ae31e2 100644
--- a/weed/wdclient/masterclient.go
+++ b/weed/wdclient/masterclient.go
@@ -36,9 +36,7 @@ func NewMasterClient(grpcDialOption grpc.DialOption, clientType string, clientHo
 }
 
 func (mc *MasterClient) GetMaster() string {
-	for mc.currentMaster == "" {
-		time.Sleep(time.Duration(rand.Int31n(200)) * time.Millisecond)
-	}
+	mc.WaitUntilConnected()
 	return mc.currentMaster
 }