diff --git a/code/WorkInProgress/AI_Visibility.dm b/code/WorkInProgress/AI_Visibility.dm
index 6400c479ca8..100fa36fea2 100644
--- a/code/WorkInProgress/AI_Visibility.dm
+++ b/code/WorkInProgress/AI_Visibility.dm
@@ -253,6 +253,13 @@ var/datum/cameranet/cameranet = new()
 	..()
 	eyeobj.ai = src
 
+/mob/living/silicon/ai/death(gibbed)
+	if(client && client.eye == eyeobj)
+		for(var/datum/camerachunk/c in eyeobj.visibleCameraChunks)
+			c.remove(eyeobj)
+		client.eye = src
+	return ..(gibbed)
+
 /mob/living/silicon/ai/verb/freelook()
 	set category = "AI Commands"
 	set name = "freelook"