diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 2ba4eb6823a..58d72425b66 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -152,6 +152,11 @@
 						"<span class='notice'>You hear metal clanking.</span>")
 			qdel(W)
 
+	else if(istype(W, /obj/item/gripper) && buckled_mob)
+		var/obj/item/gripper/G = W
+		if(!G.wrapped)
+			user_unbuckle_mob(user)
+
 	else if(!istype(W, /obj/item/bedsheet))
 		..()
 
diff --git a/html/changelogs/geeves-gripper_unbuckle.yml b/html/changelogs/geeves-gripper_unbuckle.yml
new file mode 100644
index 00000000000..b70c4064649
--- /dev/null
+++ b/html/changelogs/geeves-gripper_unbuckle.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - rscadd: "Borgs can now unbuckle people from beds and chairs by using an empty gripper on the chair or bed."