diff --git a/lua/entities/gmod_subway_base/init.lua b/lua/entities/gmod_subway_base/init.lua
index b868746..8e7e437 100644
--- a/lua/entities/gmod_subway_base/init.lua
+++ b/lua/entities/gmod_subway_base/init.lua
@@ -303,6 +303,11 @@ function ENT:GetWagonNumber()
 end
 -- Remove entity
 function ENT:OnRemove()
+    -- Remove FailSim objects
+    for k,v in pairs(self.Systems) do
+        if FailSim.Objects[v] then FailSim.Objects[v] = nil end
+    end
+
     -- Remove all linked objects
     constraint.RemoveAll(self)
     if self.TrainEntities then