diff --git a/common/traits/RG_machine_species_trait.txt b/common/traits/RG_machine_species_trait.txt
index 826f0cd..3cb7eb6 100644
--- a/common/traits/RG_machine_species_trait.txt
+++ b/common/traits/RG_machine_species_trait.txt
@@ -9,7 +9,11 @@ rg_machine_maid_trait = {
 			RG_tradition5_or_gray_owner_trigger = yes
 		}
 	}
-	species_possible_remove = { always = no }
+	species_possible_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
 	species_possible_merge_add = {
 		FROM = {
 			RG_tradition5_or_gray_owner_trigger = yes
@@ -85,6 +89,18 @@ trait_rg_machine_unit = {
 		always = no
 	}
 
+	species_possible_merge_add = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+
+	species_possible_merge_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+
 	icon = "gfx/interface/icons/traits/trait_machine_unit.dds"
 	allowed_archetypes = { RG_MACHINE }