diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 3006bd390fc..04aa281b654 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -155,6 +155,8 @@
 
 /mob/living/silicon/robot/drone/construction/matriarch/ghostize(can_reenter_corpse, should_set_timer)
 	. = ..()
+	if(stat == DEAD)
+		return
 	if(src in mob_list) // needs to exist to reopen spawn atom
 		set_name(initial(name))
 		request_player()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 604e78cac41..addcea91cac 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -1251,4 +1251,6 @@ proc/is_blind(A)
 /mob/proc/set_name(var/new_name)
 	real_name = new_name
 	name = real_name
-	voice_name = real_name
\ No newline at end of file
+	voice_name = real_name
+	if(mind)
+		mind.name = real_name
\ No newline at end of file
diff --git a/html/changelogs/geeves-another_matriarch_fix.yml b/html/changelogs/geeves-another_matriarch_fix.yml
new file mode 100644
index 00000000000..5cf4605753f
--- /dev/null
+++ b/html/changelogs/geeves-another_matriarch_fix.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Matriarch drones that die without exploding now don't open a ghost spawner slot."
+  - bugfix: "Dying as a drone will now not say died as drone in deadchat, instead just using the proper name."
\ No newline at end of file