diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java
index 2677f26a..e7b0dbdc 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java
@@ -320,12 +320,15 @@ public final class ClientConnectionTable {
         if (!this.toDelete.isEmpty()) {
             this.toDelete.forEach(id -> {
                 final UpdatableTableItem item = this.tableMapping.remove(id);
-                final List<Long> list = this.sessionIds.get(item.connectionData.clientConnection.userSessionId);
-                if (list != null) {
-                    list.remove(id);
+                if (item != null) {
+                    final List<Long> list = this.sessionIds.get(item.connectionData.clientConnection.userSessionId);
+                    if (list != null) {
+                        list.remove(id);
+                    }
                 }
             });
             this.statusFilterChanged = false;
+            this.toDelete.clear();
         }
 
         this.forceUpdateAll = false;