diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 37133f7ff3..7975f04655 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -189,9 +189,7 @@
 	..()
 
 	spawn(2)
-		var/area/A = get_area(src)
-		if(A && !A.requires_power)
-			on = 1
+		on = has_power()
 
 		switch(fitting)
 			if("tube")
@@ -398,7 +396,7 @@
 // true if area has power and lightswitch is on
 /obj/machinery/light/proc/has_power()
 	var/area/A = src.loc.loc
-	return A.lightswitch && A.power_light
+	return A.lightswitch && (!A.requires_power || A.power_light)
 
 /obj/machinery/light/proc/flicker(var/amount = rand(10, 20))
 	if(flickering) return
@@ -570,8 +568,7 @@
 // called when area power state changes
 /obj/machinery/light/power_change()
 	spawn(10)
-		var/area/A = src.loc.loc
-		seton(A.lightswitch && A.power_light)
+		seton(has_power())
 
 // called when on fire