diff --git a/charts/cluster-addons/templates/ingress-nginx.yaml b/charts/cluster-addons/templates/ingress-nginx.yaml
index 544a0e3..431fa87 100644
--- a/charts/cluster-addons/templates/ingress-nginx.yaml
+++ b/charts/cluster-addons/templates/ingress-nginx.yaml
@@ -9,13 +9,15 @@ metadata:
     addons.stackhpc.com/watch: ""
 stringData:
   defaults: |
+    {{- if .Values.monitoring.enabled }}
     controller:
-      {{- if .Values.monitoring.enabled }}
       metrics:
         enabled: true
         serviceMonitor:
           enabled: true
-      {{- end }}
+    {{- else }}
+    {}
+    {{- end }}
   overrides: |
     {{- toYaml .Values.ingress.nginx.release.values | nindent 4 }}
 ---
diff --git a/charts/cluster-addons/values.yaml b/charts/cluster-addons/values.yaml
index de12e57..16e0c12 100644
--- a/charts/cluster-addons/values.yaml
+++ b/charts/cluster-addons/values.yaml
@@ -169,6 +169,7 @@ ingress:
       version: 4.9.1
     release:
       namespace: ingress-nginx
+      values: {}
 
 # Settings for cluster monitoring
 monitoring: