diff --git a/synapse/storage/media_repository.py b/synapse/storage/media_repository.py
index 1f2eab98e3..7110a71279 100644
--- a/synapse/storage/media_repository.py
+++ b/synapse/storage/media_repository.py
@@ -244,7 +244,7 @@ class MediaRepositoryStore(SQLBaseStore):
             "SELECT media_id FROM local_media_repository_url_cache"
             " WHERE expires_ts < ?"
             " ORDER BY expires_ts ASC"
-            " LIMIT 100"
+            " LIMIT 500"
         )
 
         def _get_expired_url_cache_txn(txn):
@@ -269,7 +269,7 @@ class MediaRepositoryStore(SQLBaseStore):
             "SELECT media_id FROM local_media_repository"
             " WHERE created_ts < ? AND url_cache IS NOT NULL"
             " ORDER BY created_ts ASC"
-            " LIMIT 100"
+            " LIMIT 500"
         )
 
         def _get_url_cache_media_before_txn(txn):
diff --git a/synapse/storage/schema/delta/44/expire_url_cache.sql b/synapse/storage/schema/delta/44/expire_url_cache.sql
index 9475d53e84..e2b775f038 100644
--- a/synapse/storage/schema/delta/44/expire_url_cache.sql
+++ b/synapse/storage/schema/delta/44/expire_url_cache.sql
@@ -34,3 +34,5 @@ DROP TABLE local_media_repository_url_cache;
 ALTER TABLE local_media_repository_url_cache_new RENAME TO local_media_repository_url_cache;
 
 CREATE INDEX local_media_repository_url_cache_expires_idx ON local_media_repository_url_cache(expires_ts);
+CREATE INDEX local_media_repository_url_cache_by_url_download_ts ON local_media_repository_url_cache(url, download_ts);
+CREATE INDEX local_media_repository_url_cache_media_idx ON local_media_repository_url_cache(media_id);