diff --git a/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml b/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml
index 6bfa55d..1b74f4b 100644
--- a/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml
+++ b/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml
@@ -1,10 +1,12 @@
 {{- $namespace := .Release.Namespace -}}
+{{- if .Values.enterprise }}
 {{- with .Values.persistentStorage.sharedFileStore }}
-{{- if and .enabled .Values.enterprise }}
+{{- if .enabled }}
 {{- $name := "shared-file-store" -}}
 {{- $storageClassName := .storageClassName -}}
 {{- $storage := .storage -}}
 {{- $efsVolumeHandle := .efs.volumeHandle -}}
 {{- include "hepers.volumeHelper" (list $namespace $name $storageClassName $storage $efsVolumeHandle) }}
 {{- end }}
+{{- end }}
 {{- end }}
\ No newline at end of file