diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs
index 86a2f482..9477224e 100644
--- a/Vocaluxe/Base/CSongs.cs
+++ b/Vocaluxe/Base/CSongs.cs
@@ -217,6 +217,9 @@ namespace Vocaluxe.Base
         public static void UpdateRandomSongList()
         {
             _SongsForRandom.Clear();
+            if (NumSongsVisible == 0)
+                return;
+
             //Calc avarage sing-count
             int totalCounts = 0;
             foreach (CSong song in VisibleSongs)