diff --git a/consul/server.go b/consul/server.go
index 6f61f5a6f3..8f7d70664f 100644
--- a/consul/server.go
+++ b/consul/server.go
@@ -277,7 +277,7 @@ func NewServer(config *Config) (*Server, error) {
 		rpcTLS:                incomingTLS,
 		reassertLeaderCh:      make(chan chan error),
 		tombstoneGC:           gc,
-		shutdownCh:            make(chan struct{}),
+		shutdownCh:            shutdownCh,
 	}
 
 	// Set up the autopilot policy