diff --git a/roles/matrix-synapse/templates/goofys/env-goofys.j2 b/roles/matrix-synapse/templates/goofys/env-goofys.j2
index a9e4b6926..bb5812fc2 100644
--- a/roles/matrix-synapse/templates/goofys/env-goofys.j2
+++ b/roles/matrix-synapse/templates/goofys/env-goofys.j2
@@ -1,2 +1,3 @@
 AWS_ACCESS_KEY={{ matrix_s3_media_store_aws_access_key }}
-AWS_SECRET_KEY={{ matrix_s3_media_store_aws_secret_key }}
\ No newline at end of file
+AWS_SECRET_KEY={{ matrix_s3_media_store_aws_secret_key }}
+{% matrix_s3_media_store_custom_endpoint_enabled %}ENDPOINT={{ matrix_s3_media_store_custom_endpoint }}{% endif %}