diff --git a/src/Koogle.Web/Components/Game/ParticipantSelector.razor b/src/Koogle.Web/Components/Game/ParticipantSelector.razor
index 02a22c2..6c17487 100644
--- a/src/Koogle.Web/Components/Game/ParticipantSelector.razor
+++ b/src/Koogle.Web/Components/Game/ParticipantSelector.razor
@@ -92,18 +92,21 @@
 
     private List<DayParticipantDto> _availableParticipants = [];
     private HashSet<Guid> _selectedIds = new();
+    private bool _initialized;
+
 
-    
     protected override async Task OnParametersSetAsync()
     {
         _availableParticipants = AvailableParticipants.ToList();
         _selectedIds = new HashSet<Guid>(SelectedParticipantIds);
 
-        // Auto-select all if none selected
-        if (_selectedIds.Count == 0 && _availableParticipants.Count > 0)
+        // Auto-select all only on first load when none selected
+        if (!_initialized && _selectedIds.Count == 0 && _availableParticipants.Count > 0)
         {
+            _initialized = true;
             await SelectAll();
         }
+        _initialized = true;
     }
 
     private async Task ToggleParticipant(Guid personId)