diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 3e8ac4795..ef20804e5 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -1023,7 +1023,9 @@ federation_rr_transactions_per_room_per_second: {{ matrix_synapse_federation_rr_
 
 # Directory where uploaded images and attachments are stored.
 #
+{% if matrix_synapse_s3_media_store_local or not matrix_synapse_s3_media_store_enabled %}
 media_store_path: "/matrix-media-store-parent/{{ matrix_synapse_media_store_directory_name }}"
+{% endif %}
 
 # Media storage providers allow media to be stored in different
 # locations.