diff --git a/pkg/server/server.go b/pkg/server/server.go
index 596bac138c761873197f97455165766e10cca8dd..f517002a1d84efc3905ba75c1ff2d7e4e8e6d14e 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -68,6 +68,7 @@ func (s *Server) ServeCodec(ctx context.Context, remote codec.ReaderWriter) erro
 			}()
 		}
 	}()
+	wg.Wait()
 	allErrs = append(allErrs, err)
 	if len(allErrs) > 0 {
 		return errors.Join(allErrs...)