diff --git a/swh/templates/graphql/ingress.yaml b/swh/templates/graphql/ingress.yaml
index f43970d..70382ee 100644
--- a/swh/templates/graphql/ingress.yaml
+++ b/swh/templates/graphql/ingress.yaml
@@ -1,29 +1,27 @@
-{{ if .Values.graphql.enabled -}}
-{{ if .Values.graphql.ingress.enabled -}}
+{{ if and .Values.graphql.enabled .Values.graphql.ingress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   namespace: {{ .Values.namespace }}
   name: graphql-ingress
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
   {{- if .Values.graphql.ingress.className }}
   ingressClassName: {{ .Values.graphql.ingress.className }}
   {{- end }}
   rules:
   - http:
       paths:
       - path: {{ .Values.graphql.ingress.httpPath }}
         pathType: Prefix
         backend:
           service:
             name: graphql
             port:
               number: 5013
     {{- if .Values.graphql.ingress.host }}
     host: {{ .Values.graphql.ingress.host }}
     {{- end }}
 
 {{ end }}
-{{ end }}