diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 70126cda6..11d26c0b8 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -132,7 +132,7 @@
 - set_fact:
     matrix_synapse_media_storage_providers: |
       {{
-        media_storage_providers|default([])
+        matrix_synapse_media_storage_providers|default([])
         +
         [
           {
@@ -144,4 +144,3 @@
           }
         ]
       }}
-  when: "matrix_synapse_media_storage_provider_s3_enabled|bool"