diff --git a/server/routes.go b/server/routes.go
index e991e774..5fbc2b54 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -1086,7 +1086,7 @@ func Serve(ln net.Listener) error {
 		return err
 	}
 	<-ctx.Done()
-	return err
+	return nil
 }
 
 func waitForStream(c *gin.Context, ch chan interface{}) {