diff --git a/helm-charts/infisical/templates/ingress.yaml b/helm-charts/infisical/templates/ingress.yaml
index bde3d36d2..9b181fe64 100644
--- a/helm-charts/infisical/templates/ingress.yaml
+++ b/helm-charts/infisical/templates/ingress.yaml
@@ -1,5 +1,10 @@
 {{ if .Values.ingress.enabled }}
 {{- $ingress := .Values.ingress }}
+{{- if and $ingress.ingressClassName (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey $ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set $ingress.annotations "kubernetes.io/ingress.class" $ingress.ingressClassName}}
+  {{- end }}
+{{- end }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -9,7 +14,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  ingressClassName: {{ $ingress.ingressClassName | default "nginx"}}
+  {{- if and $ingress.ingressClassName (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ $ingress.ingressClassName | default "nginx" }}
+  {{- end }}
 {{- if $ingress.tls }}
   tls:
   {{- range $ingress.tls }}
diff --git a/helm-charts/infisical/values.yaml b/helm-charts/infisical/values.yaml
index 8253aba21..9ee624e7b 100644
--- a/helm-charts/infisical/values.yaml
+++ b/helm-charts/infisical/values.yaml
@@ -256,10 +256,13 @@ ingress:
   ## @param ingress.enabled Enable ingress
   ##
   enabled: true
-  annotations:
-    ## @skip ingress.annotations.kubernetes.io/ingress.class
-    ##
-    kubernetes.io/ingress.class: "nginx"
+  ## @param mailhog.ingress.ingressClassName Ingress class name
+  ##
+  ingressClassName: nginx
+  ## @param mailhog.ingress.annotations Ingress annotations
+  ##
+  annotations: {}
+    # kubernetes.io/ingress.class: "nginx"
     # cert-manager.io/issuer: letsencrypt-nginx
   ## @param ingress.hostName Ingress hostname (your custom domain name)
   ## Replace with your own domain
@@ -351,8 +354,7 @@ mailhog:
     ingressClassName: nginx
     ## @param mailhog.ingress.annotations Ingress annotations
     ##
-    annotations:
-      {}
+    annotations: {}
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
     ## @param mailhog.ingress.labels Ingress labels