diff --git a/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm b/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm
index 16333d396845..b99b549a9ca1 100644
--- a/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm
+++ b/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm
@@ -55,12 +55,6 @@
 	say_message = "There are more pressing matters."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/farewell/existing_tasks
-	key = "existingtasks"
-	sound = 'sound/voice/joe/existing_tasks.ogg'
-	say_message = "Existing tasks have a higher priority."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
 /datum/emote/living/carbon/human/synthetic/working_joe/farewell/gone_inconsiderate
 	key = "gone"
 	sound = 'sound/voice/joe/how_inconsiderate.ogg'
diff --git a/code/modules/mob/living/carbon/human/species/working_joe/notice.dm b/code/modules/mob/living/carbon/human/species/working_joe/notice.dm
index 781c8647c122..017424dbc053 100644
--- a/code/modules/mob/living/carbon/human/species/working_joe/notice.dm
+++ b/code/modules/mob/living/carbon/human/species/working_joe/notice.dm
@@ -43,12 +43,6 @@
 	say_message = "Unidentified species."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/notice/breach
-	key = "breach"
-	sound = 'sound/voice/joe/breach.ogg'
-	say_message = "Hazard Containment breach logged."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
 /datum/emote/living/carbon/human/synthetic/working_joe/notice/beyond_repair
 	key = "beyondrepair"
 	sound = 'sound/voice/joe/beyond_repair.ogg'
diff --git a/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm b/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm
index 4490f2dd43c2..284befe268e1 100644
--- a/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm
+++ b/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm
@@ -43,6 +43,12 @@
 	say_message = "Protected area compromised."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
+/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/breach
+	key = "breach"
+	sound = 'sound/voice/joe/breach.ogg'
+	say_message = "Hazard Containment breach logged."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
 /datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/come_out_vent
 	key = "comeoutvent"
 	sound = 'sound/voice/joe/come_out_vent.ogg'
diff --git a/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm b/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm
index 35db42d9605b..789d203aa938 100644
--- a/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm
+++ b/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm
@@ -31,12 +31,6 @@
 	say_message = "Come with me please."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/synthetic/working_joe/task_update/come_with_me
-	key = "ticketremoved"
-	sound = 'sound/voice/joe/support_ticket_removed.ogg'
-	say_message = "Service support ticket removed from queue."
-	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-
 /datum/emote/living/carbon/human/synthetic/working_joe/task_update/with_you_shortly
 	key = "withyoushortly"
 	sound = 'sound/voice/joe/with_you_shortly.ogg'
@@ -48,3 +42,15 @@
 	sound = 'sound/voice/joe/take_a_seat.ogg'
 	say_message = "Please take a seat, someone will be with you shortly."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/task_update/existing_tasks
+	key = "existingtasks"
+	sound = 'sound/voice/joe/existing_tasks.ogg'
+	say_message = "Existing tasks have a higher priority."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
+
+/datum/emote/living/carbon/human/synthetic/working_joe/task_update/come_with_me
+	key = "ticketremoved"
+	sound = 'sound/voice/joe/support_ticket_removed.ogg'
+	say_message = "Service support ticket removed from queue."
+	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE