diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b9e724..665971f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 chronology things are added/fixed/changed and - where possible - links to the PRs involved.
 
 ### Changes
+[v0.8.4]
+* do not create a pvc for shared-file-store when enterprise=false
 
 [v0.8.3]
 * fixed a bug that caused the ingress annotations to miss necessary quotes
diff --git a/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml b/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml
index e040afd..6bfa55d 100644
--- a/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml
+++ b/xenit-alfresco/templates/storage/shared-file-store-volumes.yaml
@@ -1,6 +1,6 @@
 {{- $namespace := .Release.Namespace -}}
 {{- with .Values.persistentStorage.sharedFileStore }}
-{{- if .enabled}}
+{{- if and .enabled .Values.enterprise }}
 {{- $name := "shared-file-store" -}}
 {{- $storageClassName := .storageClassName -}}
 {{- $storage := .storage -}}