diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 886ec8779b7..c9022e17934 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -616,12 +616,12 @@
 	id = "flashlight"
 
 /datum/pai_software/flashlight/toggle(mob/living/silicon/pai/user)
-	user.flashlight_on = !user.flashlight_on
+	var/atom/movable/actual_location = istype(user.loc, /obj/item/paicard) ? user.loc : user
 	if(user.flashlight_on)
-		user.set_light(2)
+		actual_location.set_light(2)
 		user.card.set_light(2)
 		return
-	user.set_light(0)
+	actual_location.set_light(2)
 	user.card.set_light(0)
 
 /datum/pai_software/flashlight/is_active(mob/living/silicon/pai/user)