diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm
index 02f9926948..cd1ad4af7c 100644
--- a/code/__DEFINES/mob_hud.dm
+++ b/code/__DEFINES/mob_hud.dm
@@ -52,6 +52,7 @@
 #define TRACKER_CO "track_co"
 #define TRACKER_XO "track_xo"
 #define TRACKER_CL "track_cl"
+#define TRACKER_PLTCO "track_pltco"
 
 #define TRACKER_ASL "_asl" // Alpha Squad Leader
 #define TRACKER_BSL "_bsl" // Bravo Squad Leader
diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
index 7e27cb5b3b..f0e4094a2c 100644
--- a/code/game/jobs/job/command/cic/staffofficer.dm
+++ b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -58,5 +58,14 @@ AddTimelock(/datum/job/command/bridge, list(
 /datum/job/command/bridge/ai/get_total_positions(latejoin = 0)
 	return latejoin ? total_positions : spawn_positions
 
+/datum/job/command/bridge/ai/generate_entry_conditions(mob/living/M, whitelist_status)
+	. = ..()
+	GLOB.marine_leaders[JOB_SO] = M
+	RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate))
+
+/datum/job/command/bridge/ai/proc/cleanup_leader_candidate(mob/M)
+	SIGNAL_HANDLER
+	GLOB.marine_leaders -= JOB_SO
+
 #undef SECOND_LT_VARIANT
 #undef FIRST_LT_VARIANT
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index f15c5b40e4..03ad971735 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -20,6 +20,7 @@
 	maxf = 1489
 
 	var/list/inbuilt_tracking_options = list(
+		"Platoon Commander" = TRACKER_PLTCO,
 		"Platoon Sergeant" = TRACKER_SL,
 		"Squad Sergeant" = TRACKER_FTL,
 		"Landing Zone" = TRACKER_LZ
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 260976af38..c13453e3b2 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1255,6 +1255,9 @@
 		if(TRACKER_XO)
 			H = GLOB.marine_leaders[JOB_XO]
 			tracking_suffix = "_xo"
+		if(TRACKER_PLTCO)
+			H = GLOB.marine_leaders[JOB_SO]
+			tracking_suffix = "_co"
 		if(TRACKER_CL)
 			var/datum/job/civilian/liaison/liaison_job = RoleAuthority.roles_for_mode[JOB_CORPORATE_LIAISON]
 			if(liaison_job?.active_liaison)