diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventManagementPanel.java
index a4ca49c4f90..b3af5cdeb71 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventManagementPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventManagementPanel.java
@@ -806,10 +806,21 @@ public class EventManagementPanel extends SimplePanel implements EventsRefresher
 
             @Override
             public void onSuccess(List<EventDTO> result) {
+                Set<UUID> selectedEventUUIDs = new HashSet<>();
+                for (EventDTO selectedEvent : eventSelectionModel.getSelectedSet()) {
+                    selectedEventUUIDs.add(selectedEvent.id);
+                }
+                eventSelectionModel.clear();
                 allEvents.clear();
                 allEvents.addAll(result);
                 eventTable.getColumnSortList().push(startEndDateColumn);
                 filterTextbox.updateAll(allEvents);
+                for (EventDTO e : allEvents) {
+                    if (selectedEventUUIDs.contains(e.id)) {
+                        eventSelectionModel.setSelected(e, true);
+                    }
+                }
+                updateLeaderboardGroupAssignmentPanel(eventSelectionModel.getSelectedSet());
             }
         });
     }