diff --git a/cli/server.go b/cli/server.go
index 68e7d539..0077800c 100644
--- a/cli/server.go
+++ b/cli/server.go
@@ -87,6 +87,10 @@ var serverRemoveCommand = &cli.Command{
 	HideHelp: true,
 	Action: func(c *cli.Context) error {
 		server := c.Args().First()
+		if server == "" {
+			cli.ShowSubcommandHelp(c)
+			return nil
+		}
 		if err := client.DeleteContext(server); err != nil {
 			logrus.Fatal(err)
 		}