diff --git a/exp_legacy/module/modules/addons/spawn-area.lua b/exp_legacy/module/modules/addons/spawn-area.lua
index b814ed19..41d2768c 100644
--- a/exp_legacy/module/modules/addons/spawn-area.lua
+++ b/exp_legacy/module/modules/addons/spawn-area.lua
@@ -114,7 +114,13 @@ local function spawn_entities(surface, position)
             protect_entity(entity)
         end
 
-        entity.operable = config.entities.operable
+        if entity then
+            entity.operable = config.entities.operable
+
+            if entity.name == "small-lamp" then
+                entity.always_on = true
+            end
+        end
     end
 end
 
diff --git a/exp_legacy/module/modules/control/warps.lua b/exp_legacy/module/modules/control/warps.lua
index 9a3f905f..8ff4df53 100644
--- a/exp_legacy/module/modules/control/warps.lua
+++ b/exp_legacy/module/modules/control/warps.lua
@@ -191,7 +191,7 @@ function Warps.make_warp_area(warp_id)
         end
 
         if entity.name == "small-lamp" then
-            warp.always_on = true
+            entity.always_on = true
         end
     end
 end