diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 6a6e53401d5..57396bec26a 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -165,6 +165,14 @@
 #define BP_AUG_ETHANOL_BURNER     "integrated ethanol burner"
 #define BP_AUG_EYE_SENSORS        "integrated eyes sensors"
 #define BP_AUG_FUEL_CELL          "integrated fuel cell"
+#define BP_AUG_FLUFF_HEAD		  "head augmentation"
+#define BP_AUG_FLUFF_HEAD_BIO	  "head bioaug"
+#define BP_AUG_FLUFF_CHEST		  "chest augmentation"
+#define BP_AUG_FLUFF_CHEST_BIO	  "chest bioaug"
+#define BP_AUG_FLUFF_R_HAND		  "right hand augmentation"
+#define BP_AUG_FLUFF_R_HAND_BIO	  "right hand bioaug"
+#define BP_AUG_FLUFF_L_HAND		  "left hand augmentation"
+#define BP_AUG_FLUFF_L_HAND_BIO	  "left hand bioaug"
 #define BP_AUG_GLARE_DAMPENER     "glare dampeners"
 #define BP_AUG_GUSTATORIAL        "integrated gustatorial centre"
 #define BP_AUG_HAIR               "synthetic hair extensions"
diff --git a/code/modules/organs/subtypes/augment/augment.dm b/code/modules/organs/subtypes/augment/augment.dm
index c4b670d4b5e..f7969b4f3ca 100644
--- a/code/modules/organs/subtypes/augment/augment.dm
+++ b/code/modules/organs/subtypes/augment/augment.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/organs/augments.dmi'
 	icon_state = "augment"
 	parent_organ = BP_CHEST
-	organ_tag = "augment"
+	organ_tag = "augment" // All augments are required to have a UNIQUE organ_tag. This is used to check organ stacking.
 	robotic = ROBOTIC_MECHANICAL
 	emp_coeff = 2
 	is_augment = TRUE
diff --git a/code/modules/organs/subtypes/augment/augments/fluff.dm b/code/modules/organs/subtypes/augment/augments/fluff.dm
index 4e73b60dffb..90f093f4719 100644
--- a/code/modules/organs/subtypes/augment/augments/fluff.dm
+++ b/code/modules/organs/subtypes/augment/augments/fluff.dm
@@ -2,6 +2,7 @@
 	name = "head augmentation"
 	desc = "An augment installed inside the head of someone."
 	parent_organ = BP_HEAD
+	organ_tag = BP_AUG_FLUFF_HEAD
 
 /obj/item/organ/internal/augment/head_fluff/die()
 	..()
@@ -24,33 +25,40 @@
 	name = "chest augmentation"
 	desc = "An augment installed inside the chest of someone."
 	parent_organ = BP_CHEST
+	organ_tag = BP_AUG_FLUFF_CHEST
 
 /obj/item/organ/internal/augment/head_fluff/rhand_fluff
 	name = "right hand augmentation"
 	desc = "An augment installed inside the right hand of someone."
 	parent_organ = BP_R_HAND
+	organ_tag = BP_AUG_FLUFF_R_HAND
 
 /obj/item/organ/internal/augment/head_fluff/lhand_fluff
 	name = "left hand augmentation"
 	desc = "An augment installed inside the left hand of someone."
 	parent_organ = BP_L_HAND
+	organ_tag = BP_AUG_FLUFF_L_HAND
 
 /obj/item/organ/internal/augment/bioaug/head_fluff
 	name = "head bioaug"
 	desc = "A bioaug installed inside the head of someone."
 	parent_organ = BP_HEAD
+	organ_tag = BP_AUG_FLUFF_HEAD_BIO
 
 /obj/item/organ/internal/augment/bioaug/head_fluff/chest_fluff
 	name = "chest bioaug"
 	desc = "A bioaug installed inside the chest of someone."
 	parent_organ = BP_CHEST
+	organ_tag = BP_AUG_FLUFF_CHEST_BIO
 
 /obj/item/organ/internal/augment/bioaug/head_fluff/rhand_fluff
 	name = "right hand bioaug"
 	desc = "A bioaug installed inside the right hand of someone."
 	parent_organ = BP_R_HAND
+	organ_tag = BP_AUG_FLUFF_R_HAND_BIO
 
 /obj/item/organ/internal/augment/bioaug/head_fluff/lhand_fluff
 	name = "left hand bioaug"
 	desc = "A bioaug installed inside the left hand of someone."
 	parent_organ = BP_L_HAND
+	organ_tag = BP_AUG_FLUFF_L_HAND_BIO
diff --git a/html/changelogs/hellfirejag-fluff-aug-tags.yml b/html/changelogs/hellfirejag-fluff-aug-tags.yml
new file mode 100644
index 00000000000..e398fb9fcaa
--- /dev/null
+++ b/html/changelogs/hellfirejag-fluff-aug-tags.yml
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "fluff augments no longer despawn if you have more than one."