diff --git a/Makefile b/Makefile
index abe0ba5d73..4645c9c4e3 100755
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,9 @@ E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS}
 ifdef KUBERNETES_VERSION # disable kubelet-registration-probe on capz cluster testing
 E2E_HELM_OPTIONS += --set linux.enableRegistrationProbe=false --set windows.enableRegistrationProbe=false
 endif
+ifeq ($(AZURE_STORAGE_DRIVER),kubernetes.io/azure-file)
+E2E_HELM_OPTIONS += --set feature.tokenRequest.enabled=false
+endif
 ifdef EXTERNAL_E2E_TEST_NFS
 E2E_HELM_OPTIONS += --set feature.enableVolumeMountGroup=false --set feature.fsGroupPolicy=File
 endif
diff --git a/charts/latest/azurefile-csi-driver-v0.0.0.tgz b/charts/latest/azurefile-csi-driver-v0.0.0.tgz
index 5174c8738d..358d6f4453 100644
Binary files a/charts/latest/azurefile-csi-driver-v0.0.0.tgz and b/charts/latest/azurefile-csi-driver-v0.0.0.tgz differ
diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml
index 77df01e32d..339bf83436 100644
--- a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml
+++ b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml
@@ -15,5 +15,7 @@ spec:
     - Persistent
     - Ephemeral
   fsGroupPolicy: {{ .Values.feature.fsGroupPolicy }}
+  {{ - if .Values.feature.tokenRequest }}
   tokenRequests:
     - audience: api://AzureADTokenExchange
+  {{- end }}
diff --git a/charts/latest/azurefile-csi-driver/values.yaml b/charts/latest/azurefile-csi-driver/values.yaml
index 25c8faa99b..9d7da9e91f 100644
--- a/charts/latest/azurefile-csi-driver/values.yaml
+++ b/charts/latest/azurefile-csi-driver/values.yaml
@@ -164,6 +164,7 @@ driver:
   azureGoSDKLogLevel: "" # available values: ""(no logs), DEBUG, INFO, WARNING, ERROR
   httpsProxy: ""
   httpProxy: ""
+  tokenRequest: true
 
 linux:
   enabled: true