diff --git a/.travis.yml b/.travis.yml
index b3f936e..00627fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 
 go:
-  - 1.9.x
+  - "1.10.x"
 
 script: go test -race -v ./...
diff --git a/server.go b/server.go
index 1a518b1..263cb45 100644
--- a/server.go
+++ b/server.go
@@ -127,13 +127,13 @@ func (s *Server) Serve(ctx context.Context, l net.Listener) error {
 
 func (s *Server) Shutdown(ctx context.Context) error {
 	s.mu.Lock()
-	lnerr := s.closeListeners()
 	select {
 	case <-s.done:
 	default:
 		// protected by mutex
 		close(s.done)
 	}
+	lnerr := s.closeListeners()
 	s.mu.Unlock()
 
 	ticker := time.NewTicker(200 * time.Millisecond)