diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index ab65298c810..64971ae37a3 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -342,3 +342,4 @@
 
 /obj/item/paicard/extinguish_light()
 	pai.extinguish_light()
+	set_light(0)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index d61de439ca2..d44c87ba94b 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -622,3 +622,4 @@
 /mob/living/silicon/pai/extinguish_light()
 	flashlight_on = FALSE
 	set_light(0)
+	card.set_light(0)
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 31497edf5ff..01c6e43c423 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -619,8 +619,10 @@
 	user.flashlight_on = !user.flashlight_on
 	if(user.flashlight_on)
 		user.set_light(2)
+		user.card.set_light(2)
 		return
 	user.set_light(0)
+	user.card.set_light(0)
 
 /datum/pai_software/flashlight/is_active(mob/living/silicon/pai/user)
 	return user.flashlight_on