diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index 1aadd8f5..8d5096e6 100644
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zammad
-version: 8.0.2
+version: 8.0.3
 appVersion: 5.3.1-15
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
diff --git a/zammad/templates/configmap-nginx.yaml b/zammad/templates/configmap-nginx.yaml
index 81b7cd49..93f9adad 100644
--- a/zammad/templates/configmap-nginx.yaml
+++ b/zammad/templates/configmap-nginx.yaml
@@ -39,9 +39,13 @@ data:
         client_max_body_size 50M;
 
         {{- /* Trusted proxies */}}
+        {{ if .Values.zammadConfig.nginx.trustedProxies }}
         {{ range .Values.zammadConfig.nginx.trustedProxies }}
         set_real_ip_from {{ . }};
         {{- end }}
+        real_ip_header X-Forwarded-For;
+        real_ip_recursive on;
+        {{- end }}
 
         {{- if .Values.zammadConfig.nginx.knowledgeBaseUrl }}
         {{ if hasPrefix "/" .Values.zammadConfig.nginx.knowledgeBaseUrl }}