diff --git a/roles/matrix/templates/synapse/config/media_store.yaml b/roles/matrix/templates/synapse/config/media_store.yaml
index 476b502..4d29570 100644
--- a/roles/matrix/templates/synapse/config/media_store.yaml
+++ b/roles/matrix/templates/synapse/config/media_store.yaml
@@ -7,7 +7,7 @@ enable_media_repo: false
 
 # Directory where uploaded images and attachments are stored.
 #
-media_store_path: null
+media_store_path: '{{ matrix__synapse__media_dir }}'
 
 # Media storage providers allow media to be stored in different
 # locations.
diff --git a/roles/matrix/vars/main.yml b/roles/matrix/vars/main.yml
index eca13f0..fc459e9 100644
--- a/roles/matrix/vars/main.yml
+++ b/roles/matrix/vars/main.yml
@@ -36,6 +36,7 @@ matrix__synapse__conf_subdir:   '{{ matrix__synapse__conf_dir }}/config'
 matrix__synapse__log_conf_file: '{{ matrix__synapse__conf_dir }}/log_config.yml'
 matrix__synapse__key_file:      '{{ matrix__synapse__conf_dir }}/signing_key'
 matrix__synapse__venv_dir:      '{{ matrix__synapse__opt_dir  }}/venv'
+matrix__synapse__media_dir:     '{{ matrix__synapse__lib_dir  }}/media_store'
 matrix__synapse__db_file:       '{{ matrix__synapse__lib_dir  }}/homeserver.db'
 matrix__synapse__pid_file:      '{{ matrix__synapse__run_dir  }}/homeserver.pid'