diff --git a/charts/loki-distributed/templates/gateway/deployment-gateway.yaml b/charts/loki-distributed/templates/gateway/deployment-gateway.yaml
index c3c2d61e97..9b752887e2 100644
--- a/charts/loki-distributed/templates/gateway/deployment-gateway.yaml
+++ b/charts/loki-distributed/templates/gateway/deployment-gateway.yaml
@@ -41,6 +41,7 @@ spec:
         {{- end }}
     spec:
       serviceAccountName: {{ include "loki.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.gateway.serviceAccount.automountServiceAccountToken }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
index 701878dbee..03efc8a309 100644
--- a/charts/loki-distributed/values.yaml
+++ b/charts/loki-distributed/values.yaml
@@ -1020,6 +1020,7 @@ gateway:
   replicas: 1
   # -- Enable logging of 2xx and 3xx HTTP requests
   verboseLogging: true
+  automountServiceAccountToken: true  # default to true for backward compatibility
   autoscaling:
     # -- Enable autoscaling for the gateway
     enabled: false