diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go
index 212ef029f..fb9b033fe 100644
--- a/cmd/admin-handlers.go
+++ b/cmd/admin-handlers.go
@@ -787,8 +787,6 @@ func (a adminAPIHandlers) SetConfigHandler(w http.ResponseWriter, r *http.Reques
 
 	// Reply to the client before restarting minio server.
 	writeSuccessResponseHeadersOnly(w)
-
-	sendServiceCmd(globalAdminPeers, serviceRestart)
 }
 
 func convertValueType(elem []byte, jsonType gjson.Type) (interface{}, error) {
@@ -920,8 +918,6 @@ func (a adminAPIHandlers) SetConfigKeysHandler(w http.ResponseWriter, r *http.Re
 
 	// Send success response
 	writeSuccessResponseHeadersOnly(w)
-
-	sendServiceCmd(globalAdminPeers, serviceRestart)
 }
 
 // UpdateCredsHandler - POST /minio/admin/v1/config/credential
diff --git a/cmd/admin-handlers_test.go b/cmd/admin-handlers_test.go
index 4dc694bc8..faf73c249 100644
--- a/cmd/admin-handlers_test.go
+++ b/cmd/admin-handlers_test.go
@@ -713,16 +713,6 @@ func TestSetConfigHandler(t *testing.T) {
 	globalMinioAddr = "127.0.0.1:9000"
 	initGlobalAdminPeers(mustGetNewEndpointList("http://127.0.0.1:9000/d1"))
 
-	var wg sync.WaitGroup
-
-	// SetConfigHandler restarts minio setup - need to start a
-	// signal receiver to receive on globalServiceSignalCh.
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		testServiceSignalReceiver(restartCmd, t)
-	}()
-
 	// Prepare query params for set-config mgmt REST API.
 	queryVal := url.Values{}
 	queryVal.Set("config", "")
@@ -782,9 +772,6 @@ func TestSetConfigHandler(t *testing.T) {
 			t.Errorf("Got unexpected response code or body %d - %s", rec.Code, respBody)
 		}
 	}
-
-	// Wait until testServiceSignalReceiver finishes its execution
-	wg.Wait()
 }
 
 func TestAdminServerInfo(t *testing.T) {
diff --git a/pkg/madmin/config-commands.go b/pkg/madmin/config-commands.go
index 4dc10bb02..b896ff78a 100644
--- a/pkg/madmin/config-commands.go
+++ b/pkg/madmin/config-commands.go
@@ -94,11 +94,6 @@ func (adm *AdminClient) GetConfig() ([]byte, error) {
 
 // GetConfigKeys - returns partial json or json value from config.json of a minio setup.
 func (adm *AdminClient) GetConfigKeys(keys []string) ([]byte, error) {
-	// No TLS?
-	if !adm.secure {
-		// return nil, fmt.Errorf("credentials/configuration cannot be retrieved over an insecure connection")
-	}
-
 	queryVals := make(url.Values)
 	for _, k := range keys {
 		queryVals.Add(k, "")