diff --git a/common/scripted_effects/rg_gray_warship_init_effects.txt b/common/scripted_effects/rg_gray_warship_init_effects.txt
index 9d5fe70..b1512ee 100644
--- a/common/scripted_effects/rg_gray_warship_init_effects.txt
+++ b/common/scripted_effects/rg_gray_warship_init_effects.txt
@@ -18,6 +18,10 @@ rg_warship_init_mod1 = {
 				random_existing_design = RG_graygoo_mothership
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -58,6 +62,10 @@ rg_warship_init_mod2 = {
 				random_existing_design = RG_graygoo_capitalship
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -99,6 +107,10 @@ rg_warship_init_mod3 = {
 				random_existing_design = RG_gray_juggernaut
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -138,6 +150,10 @@ rg_warship_init_mod0 = {
 				design = "NAME_Gray_Warship_base"
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
diff --git a/events/RG_combat_skill_events.txt b/events/RG_combat_skill_events.txt
index 280ea44..7bf5294 100644
--- a/events/RG_combat_skill_events.txt
+++ b/events/RG_combat_skill_events.txt
@@ -611,8 +611,9 @@ country_event = {
 		FromFromFrom = {
 			is_in_combat = yes
 			NOT = {
-				is_same_value = event_target:gray_warship
+				is_same_value = event_target:gray_warship_ship
 			}
+			exists = fleet.leader
 		}
 		FromFromFrom.fleet.leader = {
 			has_trait = RG_leader_trait_admiral_nanorebuild_gray
@@ -685,6 +686,16 @@ country_event = {
 	hide_window = yes
 	is_triggered_only = yes
 
+	trigger = {
+		FromFrom = {
+			is_in_combat = yes
+			exists = fleet.leader
+		}
+		FromFrom.fleet.leader = {
+			has_trait = RG_leader_trait_admiral_nanorebuild_gray
+		}
+	}
+
 	immediate = {
 		FROMFROM = { # Winning ship.
 			if = {