diff --git a/libsaria/sources/playlist.py b/libsaria/sources/playlist.py
index 10ddb3e4..15447c22 100644
--- a/libsaria/sources/playlist.py
+++ b/libsaria/sources/playlist.py
@@ -6,8 +6,8 @@ import libsaria
 from libsaria.sources import library
 call = libsaria.event.call
 
-song_list = None
-song_set  = None
+song_list = []
+song_set  = set(song_list)
 
 filtered   = False
 visible    = None