diff --git a/src/Koogle.Web/Components/Game/ThrowPanel.razor b/src/Koogle.Web/Components/Game/ThrowPanel.razor
index 49c68e4..f82c3d3 100644
--- a/src/Koogle.Web/Components/Game/ThrowPanel.razor
+++ b/src/Koogle.Web/Components/Game/ThrowPanel.razor
@@ -31,7 +31,9 @@
     @* Throw counter and mode info *@
     <div class="throw-info">
         <MudChip T="string" Color="Color.Info" Size="Size.Medium">
-            Wurf @(ThrowPanelState.ThrowCounterPerRound + 1) / @ThrowPanelState.ThrowsPerRound
+            
+            @GetThrowCountInfo()
+            
         </MudChip>
         <MudChip T="string" Color="Color.Secondary" Size="Size.Medium">
             @GetThrowModeDisplay()
@@ -182,4 +184,13 @@
         }
     }
 
+    private string GetThrowCountInfo()
+    {
+        if (ThrowPanelState.ThrowsPerRound < int.MaxValue)
+        {
+            return $"Wurf {ThrowPanelState.ThrowCounterPerRound + 1} / {ThrowPanelState.ThrowsPerRound}";
+        }
+        return $"Wurf {ThrowPanelState.ThrowCounterPerRound + 1}";
+    }
+
 }