diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index f7321d0a8..1bec889dc 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -266,6 +266,7 @@ class File(models.Model):
                     f.write(chunk.read())
             if done:
                 stream.available = True
+                stream.info = {}
                 stream.save()
             return True
         return False
diff --git a/pandora/item/views.py b/pandora/item/views.py
index cd0347324..7a00b2a6a 100644
--- a/pandora/item/views.py
+++ b/pandora/item/views.py
@@ -867,6 +867,7 @@ def video(request, id, resolution, format, index=None):
     #if streams.count() != 1:
     # reise Http404
     streams = Stream.objects.filter(file__item__itemId=item.itemId,
+        file__selected=True,
         resolution=resolution, format=format).order_by('file__part', 'file__sort_path')
     if index + 1 > streams.count():
         raise Http404