diff --git a/server/djrandom/model/mp3.py b/server/djrandom/model/mp3.py
index 956f7762665ac6092a837848132d915d550343c5..92e0ce9d90c31fa6306f05347ad813c731846880 100644
--- a/server/djrandom/model/mp3.py
+++ b/server/djrandom/model/mp3.py
@@ -189,7 +189,8 @@ class MP3(Base):
     @classmethod
     def never_played(cls, n=10):
         """Return N random songs that were never played."""
-        return cls.get_random_songs(n, where_clause=(cls.play_count == 0))
+        return cls.get_random_songs(n, where_clause=(
+                (cls.play_count == 0) & (cls.state == cls.READY)))
 
     @classmethod
     def uploads_by_day(cls, days=30):