diff --git a/packages/api-gateway/bin/server.ts b/packages/api-gateway/bin/server.ts
index 0ee90bdf2..1ed26723f 100644
--- a/packages/api-gateway/bin/server.ts
+++ b/packages/api-gateway/bin/server.ts
@@ -78,7 +78,9 @@ void container.load().then((container) => {
         limit: '50mb',
         verify: (_req: IncomingMessage, _res: ServerResponse, buf: Buffer, encoding: string): void => {
           try {
-            JSON.parse(buf.toString(encoding as BufferEncoding))
+            if (buf && buf.length > 0) {
+              JSON.parse(buf.toString(encoding as BufferEncoding | 'utf8'))
+            }
           } catch (error) {
             logger.error(`Invalid JSON: ${(error as Error).message}. Request body: ${buf.toString()}`)
           }