diff --git a/cmd/influxd/run/server.go b/cmd/influxd/run/server.go
index 98e395dd2d..73c0815ac3 100644
--- a/cmd/influxd/run/server.go
+++ b/cmd/influxd/run/server.go
@@ -406,6 +406,8 @@ func (s *Server) executeShutdown(c <-chan struct{}) {
 				os.Exit(1)
 			}
 			os.Exit(0)
+		case <-s.closing:
+			return
 		}
 	}
 }