diff --git a/consul/server.go b/consul/server.go
index 691def634..df24cdc99 100644
--- a/consul/server.go
+++ b/consul/server.go
@@ -334,7 +334,10 @@ func NewServer(config *Config) (*Server, error) {
 		for {
 		WAIT:
 			select {
-			case <-s.shutdownCh:
+			case <-s.serfLAN.ShutdownCh():
+				return
+
+			case <-s.serfWAN.ShutdownCh():
 				return
 
 			case <-ticker.C: