diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 3a6a4d434f7..4922f6e04db 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -235,7 +235,6 @@
 	return val
 
 /obj/item/weapon/tray/pickup(mob/user)
-	overlays = null
 
 	if(!isturf(loc))
 		return
@@ -257,6 +256,11 @@
 			overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer)
 
 /obj/item/weapon/tray/dropped(mob/user)
+
+	var/mob/living/M
+	for(M in src.loc) //to handle hand switching
+		return
+
 	var/foundtable = 0
 	for(var/obj/structure/table/T in loc)
 		foundtable = 1