diff --git a/charts/incubator/authentik/Chart.yaml b/charts/incubator/authentik/Chart.yaml
index 3e9d0e8d6d1..f175ce5b0e6 100644
--- a/charts/incubator/authentik/Chart.yaml
+++ b/charts/incubator/authentik/Chart.yaml
@@ -27,7 +27,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/authentik
   - https://github.com/goauthentik/authentik
   - https://goauthentik.io/docs/
-version: 3.0.1
+version: 3.0.2
 annotations:
   truecharts.org/catagories: |
     - authentication
diff --git a/charts/incubator/authentik/templates/_config.tpl b/charts/incubator/authentik/templates/_config.tpl
index cd1824037d8..b8868f9168f 100644
--- a/charts/incubator/authentik/templates/_config.tpl
+++ b/charts/incubator/authentik/templates/_config.tpl
@@ -22,10 +22,14 @@ data:
   AUTHENTIK_POSTGRESQL__HOST: {{ printf "%v-%v" .Release.Name "postgresql" }}
   AUTHENTIK_POSTGRESQL__PORT: "5432"
   {{/* Mail */}}
-  AUTHENTIK_EMAIL__PORT: {{ .Values.authentik.mail.port | quote }}
+  {{- with .Values.authentik.mail.port }}
+  AUTHENTIK_EMAIL__PORT: {{ . | quote }}
+  {{- end }}
   AUTHENTIK_EMAIL__USE_TLS: {{ .Values.authentik.mail.tls | quote }}
   AUTHENTIK_EMAIL__USE_SSL: {{ .Values.authentik.mail.ssl | quote }}
-  AUTHENTIK_EMAIL__TIMEOUT: {{ .Values.authentik.mail.timeout | quote }}
+  {{- with .Values.authentik.mail.timeout }}
+  AUTHENTIK_EMAIL__TIMEOUT: {{ . | quote }}
+  {{- end }}
   {{/* Logging */}}
   {{- with .Values.authentik.logging.log_level }}
   AUTHENTIK_LOG_LEVEL: {{ . }}