diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 6ccbb45912f..91dd273bdff 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -42,9 +42,12 @@
 	else
 		..(over_object)
 
-/obj/item/clothing/suit/armor/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/clothing/suit/armor/attackby(obj/item/W, mob/user)
 	..()
-	if (pockets)
+	if(istype(W, /obj/item/clothing/accessory/armor_plate))
+		if(W in accessories) //We already attached this. Don't try to put it in our pockets
+			return
+	if(pockets)
 		pockets.attackby(W, user)
 
 /obj/item/clothing/suit/armor/emp_act(severity)
diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm
index 5c26565ccbf..07abf6bb831 100644
--- a/code/modules/mob/living/bot/ed209bot.dm
+++ b/code/modules/mob/living/bot/ed209bot.dm
@@ -322,7 +322,7 @@
 				return 1
 
 		if(2)
-			if(istype(W, /obj/item/clothing/suit/storage/vest))
+			if(istype(W, /obj/item/clothing/accessory/armor_plate))
 				user.drop_from_inventory(W,get_turf(src))
 				qdel(W)
 				build_step++
@@ -338,7 +338,7 @@
 				if(WT.remove_fuel(0, user))
 					build_step++
 					name = "shielded frame assembly"
-					to_chat(user, "<span class='notice'>You welded the vest to [src].</span>")
+					to_chat(user, "<span class='notice'>You welded the armor to [src].</span>")
 					return 1
 		if(4)
 			if(istype(W, /obj/item/clothing/head/helmet))
@@ -377,7 +377,7 @@
 				return
 
 		if(7)
-			if(istype(W, /obj/item/gun/energy/taser))
+			if(istype(W, /obj/item/gun/energy/disruptorpistol))
 				name = "taser ED-209 assembly"
 				build_step++
 				to_chat(user, "<span class='notice'>You add [W] to [src].</span>")
diff --git a/html/changelogs/doxxmedearly - ed209_update.yml b/html/changelogs/doxxmedearly - ed209_update.yml
new file mode 100644
index 00000000000..f8ff23bcf2b
--- /dev/null
+++ b/html/changelogs/doxxmedearly - ed209_update.yml	
@@ -0,0 +1,7 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes:
+  - bugfix: "Updated the ED-209 construction recipe to the new equipment. It now uses armor plates (NOT the plate carriers) instead of the old vests, and disruptor pistols instead of tasers."
+  - bugfix: "Fixed a bug where attaching armor plate to a plate carrier would also try to put the plate in its pockets, giving the message that the plate was too long to fit in the carrier."