diff --git a/code/game/objects/items/robot/cyborg_gripper.dm b/code/game/objects/items/robot/cyborg_gripper.dm
index a656ae92a10..393c8d8e112 100644
--- a/code/game/objects/items/robot/cyborg_gripper.dm
+++ b/code/game/objects/items/robot/cyborg_gripper.dm
@@ -90,7 +90,7 @@
 
 		// Pass the attack on to the target. This might delete/relocate gripped_item.
 		if(!target.item_interaction(user, gripped_item, modifiers))
-			gripped_item.melee_attack_chain(user, target, modifiers)
+			gripped_item.melee_attack_chain(user, target, list2params(modifiers))
 		// Check to see if there is still an item in the gripper (stackable items trigger this).
 		if(!gripped_item && length(contents))
 			gripped_item = contents[1]
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index dac03e147c6..ce70b199c2d 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -301,7 +301,7 @@
 			return FALSE
 		if(user.a_intent != INTENT_HELP) // Stops you from putting your baton in the closet on accident
 			return
-		if(isrobot(user))
+		if(isrobot(user) && !istype(W.loc, /obj/item/gripper))
 			return
 		if(!user.drop_item()) //couldn't drop the item
 			to_chat(user, "<span class='notice'>\The [W] is stuck to your hand, you cannot put it in \the [src]!</span>")
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index ac0e649cea6..8dc548e7be8 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -232,7 +232,7 @@
 		tablepush(I, user)
 		return
 
-	if(isrobot(user))
+	if(isrobot(user) && !istype(I.loc, /obj/item/gripper))
 		return
 
 	if(user.a_intent == INTENT_HELP && !(I.flags & ABSTRACT))
@@ -945,7 +945,7 @@
 		return TRUE
 
 /obj/structure/rack/attackby__legacy__attackchain(obj/item/W, mob/user, params)
-	if(isrobot(user))
+	if(isrobot(user) && !istype(W.loc, /obj/item/gripper))
 		return
 	if(user.a_intent == INTENT_HARM)
 		return ..()