diff --git a/plugins/config/src/subcommands/subcommands.go b/plugins/config/src/subcommands/subcommands.go
index 94460a188..2d7cdb04a 100644
--- a/plugins/config/src/subcommands/subcommands.go
+++ b/plugins/config/src/subcommands/subcommands.go
@@ -12,7 +12,7 @@ import (
 
 func getKeys(args []string, global bool) []string {
 	keys := args
-	if !global && len(keys) > 1 {
+	if !global && len(keys) > 0 {
 		keys = keys[1:]
 	}
 	return keys
diff --git a/plugins/config/subcommands.go b/plugins/config/subcommands.go
index b610eade4..947585f7d 100644
--- a/plugins/config/subcommands.go
+++ b/plugins/config/subcommands.go
@@ -120,6 +120,7 @@ func CommandSet(appName string, pairs []string, global bool, noRestart bool, enc
 	if len(pairs) == 0 {
 		return errors.New("At least one env pair must be given")
 	}
+
 	updated := make(map[string]string)
 	for _, e := range pairs {
 		parts := strings.SplitN(e, "=", 2)