diff --git a/Content.Server/CrewManifest/CrewManifestEui.cs b/Content.Server/CrewManifest/CrewManifestEui.cs
index 82a64987ee..0f9394f53a 100644
--- a/Content.Server/CrewManifest/CrewManifestEui.cs
+++ b/Content.Server/CrewManifest/CrewManifestEui.cs
@@ -40,8 +40,15 @@ public sealed class CrewManifestEui : BaseEui
         switch (msg)
         {
             case CrewManifestEuiClosed:
-                _crewManifest.CloseEui(_station, Player, Owner);
+                Closed();
                 break;
         }
     }
+
+    public override void Closed()
+    {
+        base.Closed();
+
+        _crewManifest.CloseEui(_station, Player, Owner);
+    }
 }
diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs
index 9ce621ae76..1064379a17 100644
--- a/Content.Server/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Server/CrewManifest/CrewManifestSystem.cs
@@ -186,8 +186,8 @@ public sealed class CrewManifestSystem : EntitySystem
 
         if (eui.Owner == owner)
         {
-            eui.Close();
             euis.Remove(session);
+            eui.Close();
         }
 
         if (euis.Count == 0)