diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
index fc223b72ef..a0d78c1301 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -634,7 +634,7 @@
 
 /datum/equipment_preset/synth/working_joe/engi
 	name = "Synthetic - Hazmat Joe"
-	joe_type = SYNTH_WORKING_JOE
+	joe_type = SYNTH_HAZARD_JOE
 
 /datum/equipment_preset/synth/working_joe/engi/load_gear(mob/living/carbon/human/new_human)
 	var/choice = rand(1,2)
diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm
index 8f24dbc76f..0273fe6b90 100644
--- a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm
@@ -16,7 +16,7 @@
 /datum/species/synthetic/colonial/working_joe/hazard
 	name = SYNTH_HAZARD_JOE //TECHNICALLY the proper name would be Hazard Working Joes, but we will stick with Hazard Joe for now
 	name_plural = "Hazard Joes"
-	emote_panel_type = /datum/joe_emote_panel
+	emote_panel_type = /datum/joe_emote_panel/hazard
 
 /datum/species/synthetic/colonial/working_joe/handle_post_spawn(mob/living/carbon/human/joe)
 	. = ..()