diff --git a/server/render.js b/server/render.js
index 7abf7be9..3f700657 100644
--- a/server/render.js
+++ b/server/render.js
@@ -127,7 +127,7 @@ export async function renderScriptError (req, res, page, error) {
   // Asks CDNs and others to not to cache the errored page
   res.setHeader('Cache-Control', 'no-store, must-revalidate')
 
-  if (error.code === 'ENOENT') {
+  if (error.code === 'ENOENT' || error.message === 'INVALID_BUILD_ID') {
     res.statusCode = 404
     res.end('404 - Not Found')
     return