diff --git a/pkg/modules/api/api.go b/pkg/modules/api/api.go
index 816be41a..ca8c9279 100644
--- a/pkg/modules/api/api.go
+++ b/pkg/modules/api/api.go
@@ -382,11 +382,7 @@ func (a *API) Start() error {
 			checks := append(a.healthChecks, health.WithTimeout(a.processTimeout))
 			checker := health.NewChecker(checks...)
 
-			return func(echoCtx echo.Context) error {
-				health.NewHandler(checker).ServeHTTP(echoCtx.Response().Writer, echoCtx.Request())
-
-				return nil
-			}
+			return echo.WrapHandler(health.NewHandler(checker))
 		}(),
 		timeoutMiddleware(hardTimeout),
 	)