diff --git a/src/handlers/response-validation.js b/src/handlers/response-validation.js
index 940909d..7f145c4 100644
--- a/src/handlers/response-validation.js
+++ b/src/handlers/response-validation.js
@@ -1,9 +1,4 @@
 export default (logger, validateResponse) => (context, request, response) => {
-  // Prevent sending headers if they're already sent
-  if (response.headersSent) {
-    return undefined
-  }
-
   const responseDoesntNeedValidation = response.statusCode >= 400
   if (responseDoesntNeedValidation) {
     return response.json(context.response)
@@ -27,15 +22,16 @@ export default (logger, validateResponse) => (context, request, response) => {
         response: context.response
       })
     }
+    const errorResponse = {
+      errors: valid.errors,
+      status: 502,
+      timestamp: new Date(),
+      message: 'Bad response'
+    }
     if (!response.headersSent) {
-      return response.status(502).json({
-        errors: valid.errors,
-        status: 502,
-        timestamp: new Date(),
-        message: 'Bad response'
-      })
+      return response.status(502).json(errorResponse)
     }
-    return undefined
+    return errorResponse
   }
 
   if (!context.response) {