diff --git a/server_setup.coffee b/server_setup.coffee
index 9f075e26d..675321c3f 100644
--- a/server_setup.coffee
+++ b/server_setup.coffee
@@ -249,4 +249,4 @@ setupProxyMiddleware = (app) ->
     req.proxied = true
     proxy.web req, res, (e) ->
       console.warn("Failed to proxy: ", e)
-      next()
+      res.status(502).send({message: 'Proxy failed'})