diff --git a/Subsurface/Source/Map/MapEntity.cs b/Subsurface/Source/Map/MapEntity.cs
index 070b6fd62..6ec889944 100644
--- a/Subsurface/Source/Map/MapEntity.cs
+++ b/Subsurface/Source/Map/MapEntity.cs
@@ -348,7 +348,7 @@ namespace Barotrauma
 
             if (selectedList.Contains(this))
             {
-                selectedList.Remove(this);
+                selectedList = selectedList.FindAll(e => e != this);
             }
 
             if (aiTarget != null) aiTarget.Remove();