diff --git a/src/server/admin-app.ts b/src/server/admin-app.ts
index 63c4456f..e8428d44 100644
--- a/src/server/admin-app.ts
+++ b/src/server/admin-app.ts
@@ -1,11 +1,9 @@
 import { fastify, FastifyInstance, FastifyServerOptions } from 'fastify'
-
-import FastifyMetrics from 'fastify-metrics'
+import fastifyMetrics from 'fastify-metrics'
 
 export function build(opts: FastifyServerOptions = {}): FastifyInstance {
   const app = fastify(opts)
-  // @ts-ignore fastify-metrics doesn't work with NodeNext resolution
-  app.register(FastifyMetrics, {
+  app.register(fastifyMetrics.default, {
     endpoint: '/metrics',
     routeMetrics: { enabled: false },
   })
diff --git a/src/server/server.ts b/src/server/server.ts
index 3527b218..7d0ae129 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -158,9 +158,15 @@ if (EXPORT_DOCS) {
       app.log.error(err)
     }
     await app.close()
+    await adminApp.close()
   })
   app.addHook('onClose', async () => {
     closeListeners.uninstall()
+    await adminApp.close()
+  })
+  adminApp.addHook('onClose', async () => {
+    closeListeners.uninstall()
+    await app.close()
   })
 
   app.listen({ port: PG_META_PORT, host: PG_META_HOST }, (err) => {