diff --git a/pandora/edit/models.py b/pandora/edit/models.py
index 69b7bb370..554ae0689 100644
--- a/pandora/edit/models.py
+++ b/pandora/edit/models.py
@@ -251,7 +251,7 @@ class Edit(models.Model):
                 items = [i['id'] for i in self.get_items(user).values('id')]
                 clips = clips.filter(item__in=items)
             else:
-                clips = None
+                clips = clip.models.Clip.objects.filter(id=None)
         return clips
 
     def get_clips_json(self, user=None):