diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index e9048363..243346f3 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 4.6.7
+version: 4.6.8
 appVersion: 29.0.0
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/charts/nextcloud/templates/secrets.yaml b/charts/nextcloud/templates/secrets.yaml
index 9b3ed4f9..0858255e 100644
--- a/charts/nextcloud/templates/secrets.yaml
+++ b/charts/nextcloud/templates/secrets.yaml
@@ -17,9 +17,9 @@ data:
   {{- else }}
   nextcloud-password: {{ randAlphaNum 10 | b64enc | quote }}
   {{- end }}
-  {{- with .Values.metrics.token }}
-  nextcloud-token: {{ . | b64enc | quote }}
-  {{- else }}
+  {{- if and .Values.metrics.enabled .Values.metrics.token }}
+  nextcloud-token: {{ .Values.metrics.token | b64enc | quote }}
+  {{- else if and .Values.metrics.enabled (not .Values.metrics.token) }}
   nextcloud-token: {{ randAlphaNum 10 | b64enc | quote }}
   {{- end }}
   {{- if .Values.nextcloud.mail.enabled }}