diff --git a/rhodecode/lib/middleware/request_wrapper.py b/rhodecode/lib/middleware/request_wrapper.py
index 5964b15d..620fefd0 100644
--- a/rhodecode/lib/middleware/request_wrapper.py
+++ b/rhodecode/lib/middleware/request_wrapper.py
@@ -85,7 +85,8 @@ class RequestWrapperTween:
                     "ip": ip,
                 },
             )
-            response.headers.setdefault("X-Rc-Req-Id", req_id)
+            if response:
+                response.headers.setdefault("X-Rc-Req-Id", req_id)
 
             statsd = request.registry.statsd
             if statsd: