diff --git a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml
index 8053f408c..581500383 100644
--- a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml
+++ b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml
@@ -1,4 +1,4 @@
-{{- if .Values.s3.endpoint }}
+{{- if ( or .Values.s3.endpoint .Values.s3.configMap.enabled ) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/utils/helm/speckle-server/templates/fileimport_service/service.yml b/utils/helm/speckle-server/templates/fileimport_service/service.yml
index 5a237a6ee..38bc48f99 100644
--- a/utils/helm/speckle-server/templates/fileimport_service/service.yml
+++ b/utils/helm/speckle-server/templates/fileimport_service/service.yml
@@ -1,4 +1,4 @@
-{{- if .Values.s3.endpoint -}}
+{{- if ( or .Values.s3.endpoint .Values.s3.configMap.enabled ) -}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml b/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml
index 24bdaba2e..1dd32b1ed 100644
--- a/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml
+++ b/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml
@@ -1,4 +1,4 @@
-{{- if .Values.fileimport_service.serviceAccount.create -}}
+{{- if (and ( or .Values.s3.endpoint .Values.s3.configMap.enabled ) .Values.fileimport_service.serviceAccount.create) -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata: