diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index 4d630ce494b..beb3c06dab7 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -210,3 +210,9 @@
 	icon_state = "firing_pin_blue"
 	suit_requirement = /obj/item/clothing/suit/bluetag
 	tagcolor = "blue"
+
+
+/obj/item/device/firing_pin/Destroy()
+	if(gun)
+		gun.pin = null
+	return ..()
\ No newline at end of file