diff --git a/plugins/catalog-backend/src/service/response/write.ts b/plugins/catalog-backend/src/service/response/write.ts
index e76369fbc6..31f14eea7f 100644
--- a/plugins/catalog-backend/src/service/response/write.ts
+++ b/plugins/catalog-backend/src/service/response/write.ts
@@ -94,6 +94,9 @@ export async function writeEntitiesResponse(
 export async function writeResponseData(res: Response, data: string | Buffer) {
   const ok = res.write(data, 'utf8');
   if (!ok) {
+    if (!res.writableNeedDrain) {
+      return true;
+    }
     const closed = await new Promise<boolean>(resolve => {
       function onContinue() {
         res.off('drain', onContinue);