diff --git a/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModeChallenge/PartyScreenChallengeMain.cs
index 717bc7de..547aa6f5 100644
--- a/PartyModeChallenge/PartyScreenChallengeMain.cs
+++ b/PartyModeChallenge/PartyScreenChallengeMain.cs
@@ -421,6 +421,9 @@ namespace Vocaluxe.PartyModes
             int NumPlayerInOneRow = 3;
             if (GameState.NumPlayerAtOnce <= NumPlayerInOneRow)
                 NumRoundsVisible = 5;
+            else
+                NumRoundsVisible = 3;
+
             if (NumRoundsVisible > GameState.Combs.Count)
                 NumRoundsVisible = GameState.Combs.Count;
 
@@ -496,9 +499,14 @@ namespace Vocaluxe.PartyModes
                         RoundsTable[i].TextScores[p].Visible = false;
                     }
                 }
-                if (GameState.Combs.Count < i + RoundsTableOffset)
+                if (GameState.Combs.Count < i + RoundsTableOffset || i + 1 > NumRoundsVisible)
                 {
                     RoundsTable[i].Number.Visible = false;
+                    for (int p = 0; p < RoundsTable[i].TextPlayer.Count; p++)
+                    {
+                        RoundsTable[i].TextPlayer[p].Visible = false;
+                        RoundsTable[i].TextScores[p].Visible = false;
+                    }                   
                 }
             }