diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
index 573a61dab8..11cf32432a 100644
--- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
+++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
@@ -326,8 +326,8 @@ namespace Content.Server.GameObjects.Components.Buckle
 
             if (Owner.Transform.Parent == BuckledTo.Owner.Transform)
             {
+                ContainerHelpers.AttachParentToContainerOrGrid(Owner.Transform);
                 Owner.Transform.WorldRotation = BuckledTo.Owner.Transform.WorldRotation;
-                Owner.Transform.DetachParent();
             }
 
             BuckledTo = null;
diff --git a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs
index f8fed63fc1..87495abe8e 100644
--- a/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs
+++ b/Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs
@@ -204,7 +204,7 @@ namespace Content.Server.GameObjects.Components.Movement
             // Departure
             // Do we need to rate-limit sounds to stop ear BLAST?
             soundPlayer.PlayAtCoords(_departureSound, entity.Transform.GridPosition);
-            entity.Transform.DetachParent();
+            entity.Transform.AttachToGridOrMap();
             entity.Transform.GridPosition = position;
             soundPlayer.PlayAtCoords(_arrivalSound, entity.Transform.GridPosition);
             TryChangeState(PortalState.RecentlyTeleported);
diff --git a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs
index 949b2cbbbe..e1e44cec21 100644
--- a/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs
+++ b/Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs
@@ -251,7 +251,7 @@ namespace Content.Server.GameObjects.Components.Movement
                 soundPlayer.PlayAtCoords(_departureSound, user.Transform.GridPosition);
 
                 // Arrival
-                user.Transform.DetachParent();
+                user.Transform.AttachToGridOrMap();
                 user.Transform.WorldPosition = vector;
                 soundPlayer.PlayAtCoords(_arrivalSound, user.Transform.GridPosition);
             }
diff --git a/RobustToolbox b/RobustToolbox
index 40a8dae236..a3d250a5c4 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 40a8dae236328a54d84a26ae181106e651c624b6
+Subproject commit a3d250a5c47076b0008db465fa47bdc04b7370a8