diff --git a/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml b/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
index 556d59a..277ea57 100644
--- a/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
+++ b/helm-charts/gerrit-replica/templates/gerrit-replica.deployment.yaml
@@ -139,14 +139,14 @@
           symlink_config_to_site
 
           mkdir -p /var/gerrit/data
+          {{- range .Values.gerritReplica.additionalConfigMaps }}
           if [ -d /var/mnt/data ]; then
-            {{- range .Values.gerritReplica.additionalConfigMaps }}
             for file in $(find /var/mnt/data/{{ .subDir }} -type f); do
               mkdir -p /var/gerrit/data/{{ .subDir }}
               ln -sf $file /var/gerrit/data/{{ .subDir }}/$(basename $file)
             done
-            {{- end }}
           fi
+          {{- end }}
 
           if [ ! -d /var/gerrit/git ]; then
             ln -sf /var/mnt/git /var/gerrit/
diff --git a/helm-charts/gerrit/templates/gerrit.stateful-set.yaml b/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
index badc949..6f031b2 100644
--- a/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
+++ b/helm-charts/gerrit/templates/gerrit.stateful-set.yaml
@@ -83,14 +83,14 @@
           symlink_config_to_site
 
           mkdir -p /var/gerrit/data
+          {{- range .Values.gerrit.additionalConfigMaps }}
           if [ -d /var/mnt/data ]; then
-            {{- range .Values.gerrit.additionalConfigMaps }}
             for file in $(find /var/mnt/data/{{ .subDir }} -type f); do
               mkdir -p /var/gerrit/data/{{ .subDir }}
               ln -sf $file /var/gerrit/data/{{ .subDir }}/$(basename $file)
             done
-            {{- end }}
           fi
+          {{- end }}
 
           for dir in git {{ if eq .Values.gerrit.index.type "elasticsearch" }}index{{ end }}; do
             if [ ! -d /var/gerrit/$dir ]; then