diff --git a/Playlist/PlaylistLoader.m b/Playlist/PlaylistLoader.m
index a04fe72f9..10eb9f0fc 100755
--- a/Playlist/PlaylistLoader.m
+++ b/Playlist/PlaylistLoader.m
@@ -308,7 +308,7 @@
 	
 	
 	//Auto start playback
-	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"playOnAdd"]) {
+	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"playOnAdd"] && [entries count] > 0) {
 		[playbackController playEntry: [entries objectAtIndex:0]];
 	}
 }