diff --git a/agent/consul/server.go b/agent/consul/server.go
index 8482ba225e..7eccbae81e 100644
--- a/agent/consul/server.go
+++ b/agent/consul/server.go
@@ -958,9 +958,13 @@ func (s *Server) Shutdown() error {
 	}
 
 	// Close the connection pool
-	s.connPool.Shutdown()
+	if s.connPool != nil {
+		s.connPool.Shutdown()
+	}
 
-	s.acls.Close()
+	if s.acls != nil {
+		s.acls.Close()
+	}
 
 	if s.config.NotifyShutdown != nil {
 		s.config.NotifyShutdown()