diff --git a/tubesync/sync/signals.py b/tubesync/sync/signals.py
index 99e83b70..24e3f7c5 100644
--- a/tubesync/sync/signals.py
+++ b/tubesync/sync/signals.py
@@ -94,12 +94,20 @@ def source_post_save(sender, instance, created, **kwargs):
         settings.RENAME_ALL_SOURCES
     )
     if create_rename_tasks:
-        for media in Media.objects.filter(source=instance.pk, downloaded=True):
+        mqs = Media.objects.filter(
+            source=instance.pk,
+            downloaded=True,
+        ).defer(
+            'media_file',
+            'metadata',
+            'thumb',
+        )
+        for media in mqs:
             verbose_name = _('Renaming media for: {}: "{}"')
             rename_media(
                 str(media.pk),
                 queue=str(media.pk),
-                priority=5,
+                priority=15,
                 verbose_name=verbose_name.format(media.key, media.name),
                 remove_existing_tasks=True
             )
diff --git a/tubesync/sync/tasks.py b/tubesync/sync/tasks.py
index 0cdb2f32..59c4851e 100644
--- a/tubesync/sync/tasks.py
+++ b/tubesync/sync/tasks.py
@@ -596,7 +596,7 @@ def save_all_media_for_source(source_id):
 @background(schedule=0, remove_existing_tasks=True)
 def rename_media(media_id):
     try:
-        media = Media.objects.get(pk=media_id)
+        media = Media.objects.defer('metadata', 'thumb').get(pk=media_id)
     except Media.DoesNotExist:
         return
     media.rename_files()