diff --git a/proxy/serve.go b/proxy/serve.go
index cbe179615..cdb90cbe4 100644
--- a/proxy/serve.go
+++ b/proxy/serve.go
@@ -103,5 +103,8 @@ func serve(ln net.Listener, srv Server) error {
 	mu.Lock()
 	servers = append(servers, srv)
 	mu.Unlock()
-	return srv.Serve(ln)
+	if err := srv.Serve(ln); err != http.ErrServerClosed {
+		return err
+	}
+	return nil
 }