diff --git a/geoportal/c2cgeoportal_geoportal/views/mapserverproxy.py b/geoportal/c2cgeoportal_geoportal/views/mapserverproxy.py
index 0df94cd10e9..837b743cbfb 100644
--- a/geoportal/c2cgeoportal_geoportal/views/mapserverproxy.py
+++ b/geoportal/c2cgeoportal_geoportal/views/mapserverproxy.py
@@ -148,6 +148,12 @@ def proxy(self) -> Response:
             url=_url, params=self.params, cache=use_cache,
             headers=headers, body=self.request.body
         )
+
+        if self.lower_params.get("request") == "getmap" and
+                not response.content_type.starstswith('image/') and
+                response.status_code < 400:
+            response.status_code = 400
+
         return response
 
     def _proxy_callback(