diff --git a/code/datums/components/attachment.dm b/code/datums/components/attachment.dm
index 922e79ce0c21..73abc0bd7925 100644
--- a/code/datums/components/attachment.dm
+++ b/code/datums/components/attachment.dm
@@ -144,6 +144,10 @@
 	icon_icon = target.icon
 	button_icon_state = target.icon_state
 
+/datum/action/attachment/Destroy()
+	. = ..()
+	gun = null
+
 /datum/action/attachment/Trigger()
 	..()
 	SEND_SIGNAL(target, COMSIG_ATTACHMENT_TOGGLE, gun, owner)