diff --git a/command/server.go b/command/server.go
index f85bbdebe..f0fc1750b 100644
--- a/command/server.go
+++ b/command/server.go
@@ -344,7 +344,7 @@ func (c *ServerCommand) Run(args []string) int {
 
 	// Wait for shutdown
 	shutdownTriggered := false
-	for {
+	for !shutdownTriggered {
 		select {
 		case <-c.ShutdownCh:
 			c.Ui.Output("==> Vault shutdown triggered")
@@ -358,9 +358,6 @@ func (c *ServerCommand) Run(args []string) int {
 				c.Ui.Error(fmt.Sprintf("Error(s) were encountered during reload: %s", err))
 			}
 		}
-		if shutdownTriggered {
-			break
-		}
 	}
 	return 0
 }