diff --git a/server/middlewares/errorHandling.js b/server/middlewares/errorHandling.js
index 192899dc1..fb5b12074 100644
--- a/server/middlewares/errorHandling.js
+++ b/server/middlewares/errorHandling.js
@@ -44,8 +44,12 @@ export default function errorHandling() {
         error: snakeCase(err.id || error),
         status: err.status,
         message,
-        data: err.errorData ? err.errorData : {},
+        data: err.errorData,
       };
+
+      if (!ctx.body.data) {
+        delete ctx.body.data;
+      }
     }
   };
 }