diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
index 8f37afa529e..c5cdcfafbd3 100644
--- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
+++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
@@ -34,7 +34,7 @@ public sealed class MechGrabberSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; // Frontier
-    [Dependency] private readonly SharedBuckleSystem _buckle = default!;
+    [Dependency] private readonly SharedBuckleSystem _buckle = default!; // Frontier
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -190,9 +190,15 @@ private void OnMechGrab(EntityUid uid, MechGrabberComponent component, DoAfterEv
         if (!_mech.TryChangeEnergy(equipmentComponent.EquipmentOwner.Value, component.GrabEnergyDelta))
             return;
 
-        if (TryComp<StrapComponent>(args.Args.Target, out var strapComp) && strapComp.BuckledEntities != null) // Frontier: Remove people from chairs
+        // Frontier: Remove people from chairs
+        if (TryComp<StrapComponent>(args.Args.Target, out var strapComp) && strapComp.BuckledEntities != null)
+        {
             foreach (var buckleUid in strapComp.BuckledEntities)
-                _buckle.TryUnbuckle(buckleUid, buckleUid, true);
+            {
+                _buckle.Unbuckle(buckleUid, args.Args.Target);
+            }
+        }
+        // End Frontier
 
         _container.Insert(args.Args.Target.Value, component.ItemContainer);
         _mech.UpdateUserInterface(equipmentComponent.EquipmentOwner.Value);
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
index 23d0cb3c295..1b31ada341b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
@@ -23,9 +23,9 @@
     state: mecha_clamp
   - type: MechGrabber
     blacklist: # Frontier
-      components:
-        - Anomaly
-        - Mech
+      components: # Frontier
+        - Anomaly # Frontier
+        - Mech # Frontier
     maxContents: 8
   - type: UIFragment
     ui: !type:MechGrabberUi
@@ -43,9 +43,9 @@
     state: mecha_clamp_small
   - type: MechGrabber
     blacklist: # Frontier
-      components:
-        - Anomaly
-        - Mech
+      components: # Frontier
+        - Anomaly # Frontier
+        - Mech # Frontier
     maxContents: 4
     grabDelay: 3
     grabEnergyDelta: 20