diff --git a/roles/cs.varnish/templates/vcl/subroutines/deliver.vcl.j2 b/roles/cs.varnish/templates/vcl/subroutines/deliver.vcl.j2
index c73f659b..4ba0e23a 100644
--- a/roles/cs.varnish/templates/vcl/subroutines/deliver.vcl.j2
+++ b/roles/cs.varnish/templates/vcl/subroutines/deliver.vcl.j2
@@ -33,7 +33,7 @@ if (req.http.{{ varnish_debug_request_info_header_name }}) {
         req.http.{{ varnish_debug_request_info_header_name }} + "; Backend-Response-Delivered";
 }
 
-if (resp.status == 502 || resp.status == 504) {
+if (resp.status == 500 || resp.status == 502 || resp.status == 504) {
     return(synth(resp.status));
 }
 
diff --git a/roles/cs.varnish/templates/vcl/subroutines/synth.vcl.j2 b/roles/cs.varnish/templates/vcl/subroutines/synth.vcl.j2
index 43148177..42edd283 100644
--- a/roles/cs.varnish/templates/vcl/subroutines/synth.vcl.j2
+++ b/roles/cs.varnish/templates/vcl/subroutines/synth.vcl.j2
@@ -19,7 +19,7 @@ if ((resp.status == 301 || resp.status == 302) && req.http.location) {
     return (deliver);
 }
 
-if (resp.status == 502 || resp.status == 503 || resp.status == 504) {
+if (resp.status == 500 || resp.status == 502 || resp.status == 503 || resp.status == 504) {
     {{ synthetic_error_page() }}
 
     return (deliver);