diff --git a/server.go b/server.go
index 5c28afa8..3a21f4d8 100644
--- a/server.go
+++ b/server.go
@@ -474,6 +474,7 @@ func (s *Server) StartAndWait() error {
 	if err != nil {
 		return err
 	}
+	defer s.Close()
 
 	return s.Wait()
 }