diff --git a/Content.Server/Chemistry/Components/SmokeDissipateSpawnComponent.cs b/Content.Server/Chemistry/Components/SmokeDissipateSpawnComponent.cs
deleted file mode 100644
index 068ac432b6..0000000000
--- a/Content.Server/Chemistry/Components/SmokeDissipateSpawnComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Server.Fluids.EntitySystems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.Components;
-
-
-/// <summary>
-/// When a <see cref="SmokeComponent"/> despawns this will spawn another entity in its place.
-/// </summary>
-[RegisterComponent, Access(typeof(SmokeSystem))]
-public sealed partial class SmokeDissipateSpawnComponent : Component
-{
-    [DataField("prototype", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Prototype = string.Empty;
-}
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index b3590fec40..2f62f54fd1 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -38,17 +38,6 @@ public sealed class SmokeSystem : EntitySystem
         SubscribeLocalEvent<SmokeComponent, EntityUnpausedEvent>(OnSmokeUnpaused);
         SubscribeLocalEvent<SmokeComponent, ReactionAttemptEvent>(OnReactionAttempt);
         SubscribeLocalEvent<SmokeComponent, SpreadNeighborsEvent>(OnSmokeSpread);
-        SubscribeLocalEvent<SmokeDissipateSpawnComponent, TimedDespawnEvent>(OnSmokeDissipate);
-    }
-
-    private void OnSmokeDissipate(EntityUid uid, SmokeDissipateSpawnComponent component, ref TimedDespawnEvent args)
-    {
-        if (!TryComp<TransformComponent>(uid, out var xform))
-        {
-            return;
-        }
-
-        Spawn(component.Prototype, xform.Coordinates);
     }
 
     private void OnSmokeSpread(EntityUid uid, SmokeComponent component, ref SpreadNeighborsEvent args)
diff --git a/Content.Server/Spawners/Components/SpawnOnDespawnComponent.cs b/Content.Server/Spawners/Components/SpawnOnDespawnComponent.cs
new file mode 100644
index 0000000000..24b57a4b1c
--- /dev/null
+++ b/Content.Server/Spawners/Components/SpawnOnDespawnComponent.cs
@@ -0,0 +1,18 @@
+using Content.Server.Spawners.EntitySystems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Spawners.Components;
+
+/// <summary>
+/// When a <c>TimedDespawnComponent"</c> despawns, another one will be spawned in its place.
+/// </summary>
+[RegisterComponent, Access(typeof(SpawnOnDespawnSystem))]
+public sealed partial class SpawnOnDespawnComponent : Component
+{
+    /// <summary>
+    /// Entity prototype to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Prototype = string.Empty;
+}
diff --git a/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
new file mode 100644
index 0000000000..77927c9bba
--- /dev/null
+++ b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Spawners.Components;
+using Robust.Shared.Spawners;
+
+namespace Content.Server.Spawners.EntitySystems;
+
+public sealed class SpawnOnDespawnSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SpawnOnDespawnComponent, TimedDespawnEvent>(OnDespawn);
+    }
+
+    private void OnDespawn(EntityUid uid, SpawnOnDespawnComponent comp, ref TimedDespawnEvent args)
+    {
+        if (!TryComp<TransformComponent>(uid, out var xform))
+            return;
+
+        Spawn(comp.Prototype, xform.Coordinates);
+    }
+}
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 10e2f1f7db..415ecd4a98 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -89,7 +89,7 @@
     animationTime: 0.6
     animationState: mfoam-dissolve
   - type: Smoke
-  - type: SmokeDissipateSpawn
+  - type: SpawnOnDespawn
     prototype: FoamedIronMetal
 
 - type: entity
@@ -109,7 +109,7 @@
     animationTime: 0.6
     animationState: mfoam-dissolve
   - type: Smoke
-  - type: SmokeDissipateSpawn
+  - type: SpawnOnDespawn
     prototype: FoamedAluminiumMetal
 
 - type: entity