diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 794a495ae3..d95c89d19e 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -271,7 +271,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 		if(skip_mindless && (!M.mind && !M.ckey))
 			if(!isbot(M) && !iscameramob(M) && !ismegafauna(M))
 				continue
-		if(M.client && M.client.holder && M.client.holder.fakekey) //stealthmins
+		if(M.client?.holder?.fakekey && isobserver(M))
 			continue
 		var/name = avoid_assoc_duplicate_keys(M.name, namecounts)