diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index f38114cc44..276f35a836 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -288,7 +288,9 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
                     continue;
                 }
 
-                _entManager.SpawnAtPosition(entry.Proto, grid.GridTileToLocal(tile));
+                var uid = _entManager.SpawnAtPosition(entry.Proto, grid.GridTileToLocal(tile));
+                _entManager.RemoveComponent<GhostRoleComponent>(uid);
+                _entManager.RemoveComponent<GhostTakeoverAvailableComponent>(uid);
                 return;
             }
         }