diff --git a/code/modules/mob/observer/dead/orbit.dm b/code/modules/mob/observer/dead/orbit.dm
index 37450a1a736..3e18d756631 100644
--- a/code/modules/mob/observer/dead/orbit.dm
+++ b/code/modules/mob/observer/dead/orbit.dm
@@ -64,6 +64,10 @@
 				npcs += list(serialized)
 			else
 				players += list(serialized)
+		else if(isrobot(M))
+			players += list(serialized)
+		else if(isAI(M))
+			players += list(serialized)
 
 	data["players"] = players
 	data["simplemobs"] = simplemobs