diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index b1fc3398af0..c37c1cce2c8 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -293,6 +293,10 @@
 		update_icon()
 	return unwield(user)
 
+/obj/item/twohanded/shockpaddles/on_mob_move(dir, mob/user)
+	if(defib && !(defib.Adjacent(user)))
+		defib.remove_paddles(user)
+
 /obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O)
 	if(!mainunit || !istype(mainunit, /obj/item/defibrillator))	//To avoid weird issues from admin spawns
 		M.unEquip(O)