diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 0b9de6993eb..46e2b6a8887 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -141,7 +141,7 @@ await server.WaitAssertion(() =>
             }
             mapManager.DeleteMap(mapId);
         });
-
+        await server.WaitRunTicks(5);
         await pair.CleanReturnAsync();
     }
 
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 0f17151b059..ad86ceaaaef 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -393,7 +393,7 @@ await server.WaitAssertion(() =>
                     }
                 });
             });
-
+            await server.WaitRunTicks(5);
             await pair.CleanReturnAsync();
         }
     }
diff --git a/Content.Server/Backmen/Shipwrecked/NPCZombieSystem.cs b/Content.Server/Backmen/Shipwrecked/NPCZombieSystem.cs
index 21402d6d848..928918dc243 100644
--- a/Content.Server/Backmen/Shipwrecked/NPCZombieSystem.cs
+++ b/Content.Server/Backmen/Shipwrecked/NPCZombieSystem.cs
@@ -39,7 +39,10 @@ public override void Initialize()
 
     private void OnZombifyEntity(NpcZombieMakeEvent ev)
     {
-
+        if (TerminatingOrDeleted(ev.Target))
+        {
+            return;
+        }
         _zombieSystem.ZombifyEntity(ev.Target);