diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index af5dc27f617..32e6487ca57 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -695,7 +695,6 @@ var/list/blood_splatter_icons = list()
 //the sight changes to give to the mob whose perspective is set to that atom (e.g. A mob with nightvision loses its nightvision while looking through a normal camera)
 /atom/proc/update_remote_sight(mob/living/user)
 	user.sync_lighting_plane_alpha()
-	user.sync_nightvision_screen()
 	return
 
 /atom/proc/checkpass(passflag)
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index ca2837693e8..ee858138f70 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -301,5 +301,4 @@ Des: Removes all infected images from the alien.
 			lighting_alpha = min(lighting_alpha, E.lighting_alpha)
 
 	SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
-	sync_lighting_plane_alpha()
-	sync_nightvision_screen()
\ No newline at end of file
+	sync_lighting_plane_alpha()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index dae35d7b03e..31788ecc8cf 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1165,4 +1165,3 @@ so that different stomachs can handle things in different ways VB*/
 
 	SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
 	sync_lighting_plane_alpha()
-	sync_nightvision_screen()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index b6741282f0d..2cd524f8a15 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -567,7 +567,6 @@
 	dna.species.update_sight(src)
 	SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
 	sync_lighting_plane_alpha()
-	sync_nightvision_screen()
 
 //Added a safety check in case you want to shock a human mob directly through electrocute_act.
 /mob/living/carbon/human/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index 8f7869fd1d9..7dc6c042e0c 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -717,7 +717,6 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		H.sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
 
 	H.sync_lighting_plane_alpha()
-	H.sync_nightvision_screen()
 
 /datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
 	if(abs(temperature - M.bodytemperature) > 10) //If our water and mob temperature varies by more than 10K, cool or/ heat them appropriately
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 6d083c50f62..070e09f9d98 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -235,7 +235,6 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_OBSERVER
 	sync_lighting_plane_alpha()
-	sync_nightvision_screen()
 
 /mob/living/proc/handle_hud_icons()
 	handle_hud_icons_health()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 88bab9e4f1b..80d644152f4 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -1314,4 +1314,3 @@ var/list/ai_verbs_default = list(
 
 	SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
 	sync_lighting_plane_alpha()
-	sync_nightvision_screen()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 93ce56344c6..3bf3d647e51 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1453,5 +1453,4 @@ var/list/robot_verbs_default = list(
 
 	SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
 	sync_lighting_plane_alpha()
-	sync_nightvision_screen()
-	
\ No newline at end of file
+	
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 79954955256..dc05d315053 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1357,7 +1357,6 @@ var/list/slot_equipment_priority = list( \
 /mob/proc/update_sight()
 	SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
 	sync_lighting_plane_alpha()
-	sync_nightvision_screen()
 
 /mob/proc/sync_lighting_plane_alpha()
 	if(hud_used)
@@ -1365,6 +1364,8 @@ var/list/slot_equipment_priority = list( \
 		if(L)
 			L.alpha = lighting_alpha
 
+	sync_nightvision_screen() //Sync up the overlay used for nightvision to the amount of see_in_dark a mob has. This needs to be called everywhere sync_lighting_plane_alpha() is.
+
 /mob/proc/sync_nightvision_screen()
 	var/obj/screen/fullscreen/see_through_darkness/S = screens["see_through_darkness"]
 	if(S)