diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index a924bd80094..6959828f9b5 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -34,6 +34,8 @@
 			brainmob.loc = src
 			brainmob.container = src
 			brainmob.stat = 0
+			dead_mob_list -= brainmob//Update dem lists
+			living_mob_list += brainmob
 
 			user.drop_item()
 			del(O)
@@ -69,6 +71,7 @@
 			var/obj/item/brain/brain = new(user.loc)
 			brainmob.container = null//Reset brainmob mmi var.
 			brainmob.loc = brain//Throw mob into brain.
+			living_mob_list -= brainmob//Get outta here
 			brain.brainmob = brainmob//Set the brain to use the brainmob
 			brainmob = null//Set mmi brainmob var to null
 
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 585add5e15b..c4e1427d6b9 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -19,12 +19,9 @@
 			ghostize()		//Ghostize checks for key so nothing else is necessary.
 		..()
 
-	say_understands(var/other)
-		if (istype(other, /mob/living/silicon/ai))
-			if(!(container && istype(container, /obj/item/device/mmi)))//Goddamn is this hackish, but this say code is so odd
-				return 0
-			else
-				return 1
+	say_understands(var/other)//Goddamn is this hackish, but this say code is so odd
+		if (istype(other, /mob/living/silicon/ai))//No eavesdropping on the AI
+			return 0
 		if (istype(other, /mob/living/silicon/decoy))
 			if(!(container && istype(container, /obj/item/device/mmi)))
 				return 0
@@ -35,11 +32,8 @@
 				return 0
 			else
 				return 1
-		if (istype(other, /mob/living/silicon/robot))
-			if(!(container && istype(container, /obj/item/device/mmi)))
-				return 0
-			else
-				return 1
+		if (istype(other, /mob/living/silicon/robot))//Or borgs
+			return 0
 		if (istype(other, /mob/living/carbon/human))
 			return 1
 		if (istype(other, /mob/living/carbon/metroid))
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 30222c1dd40..43d520e12b4 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -125,5 +125,5 @@
 	rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span></i>"
 
 	for (var/mob/M in dead_mob_list)
-		if(!istype(M,/mob/new_player))
+		if(!istype(M,/mob/new_player) && !(istype(M,/mob/living/carbon/brain)))//No meta-evesdropping
 			M.show_message(rendered, 2)
\ No newline at end of file