diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
index 56e4c0b706..9e54d842f3 100644
--- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
+++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
@@ -390,13 +390,13 @@ namespace Content.Server.GameObjects.Components.Buckle
 
         public override void OnRemove()
         {
-            base.OnRemove();
-
             BuckledTo?.Remove(this);
             TryUnbuckle(Owner, true);
 
             _buckleTime = default;
             UpdateBuckleStatus();
+
+            base.OnRemove();
         }
 
         public override ComponentState GetComponentState(ICommonSession player)