diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 5993bf3464f..8d5385d11f7 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -18,7 +18,6 @@
 	var/invuln = null
 	var/obj/item/device/camera_bug/bug = null
 	var/obj/item/weapon/camera_assembly/assembly = null
-	var/light_on = 0
 
 	//OTHER
 
@@ -339,4 +338,4 @@
 			return 0
 		return 1
 	busy = 0
-	return 0
\ No newline at end of file
+	return 0
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index b1cdf016494..4dd7b44fef0 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -427,6 +427,8 @@ var/list/ai_list = list()
 		updatehealth()
 
 /mob/living/silicon/ai/reset_view(atom/A)
+	if (camera_light_on)
+		light_cameras()
 	if(istype(A,/obj/machinery/camera))
 		current = A
 	..()
@@ -638,6 +640,11 @@ var/list/ai_list = list()
 
 	if (!camera_light_on)
 		src << "Camera lights deactivated."
+
+		for (var/obj/machinery/camera/C in lit_cameras)
+			C.SetLuminosity(0)
+			lit_cameras = list()
+
 		return
 
 	light_cameras()