diff --git a/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs b/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs
index 5cc39d3178..87b995d7fa 100644
--- a/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs
+++ b/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs
@@ -338,7 +338,7 @@ public sealed partial class BuckleSystem
         var xform = Transform(buckleId);
         var oldBuckledXform = Transform(oldBuckledTo.Owner);
 
-        if (xform.ParentUid == oldBuckledXform.Owner)
+        if (xform.ParentUid == oldBuckledXform.Owner && !Terminating(xform.ParentUid))
         {
             _containers.AttachParentToContainerOrGrid(xform);
             xform.WorldRotation = oldBuckledXform.WorldRotation;