diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index 96e5a477..7423f1f3 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -553,7 +553,7 @@ class File(models.Model):
 
     def process_stream(self):
         '''
-            extract derivatives from webm upload
+            extract derivatives from stream upload
         '''
         from . import tasks
         return tasks.process_stream.delay(self.id)
diff --git a/pandora/item/views.py b/pandora/item/views.py
index 8ad2db2e..1670fade 100644
--- a/pandora/item/views.py
+++ b/pandora/item/views.py
@@ -1004,7 +1004,9 @@ def download_source(request, id, part=None):
     response['Content-Disposition'] = "attachment; filename*=UTF-8''%s" % quote(filename.encode('utf-8'))
     return response
 
-def download(request, id, resolution=None, format='webm', part=None):
+def download(request, id, resolution=None, format=None, part=None):
+    if format is None:
+        format = settings.CONFIG['video']['formats'][0]
     item = get_object_or_404(models.Item, public_id=id)
     if not resolution or int(resolution) not in settings.CONFIG['video']['resolutions']:
         resolution = max(settings.CONFIG['video']['resolutions'])