diff --git a/mods/ITEMS/mcl_beacons/init.lua b/mods/ITEMS/mcl_beacons/init.lua
index 06e1856f7..f9f7229a1 100644
--- a/mods/ITEMS/mcl_beacons/init.lua
+++ b/mods/ITEMS/mcl_beacons/init.lua
@@ -252,17 +252,15 @@ minetest.register_node("mcl_beacons:beacon", {
 
 				remove_beacon_beam(pos)
 				local p2 = 0
-				for y = pos.y +1, pos.y + 401 do
+				for y = pos.y +1, pos.y + 21 do
 					local node = minetest.get_node({x=pos.x,y=y,z=pos.z})
 					if node.name == ignore then
 						minetest.get_voxel_manip():read_from_map({x=pos.x,y=y,z=pos.z}, {x=pos.x,y=y,z=pos.z})
 						node = minetest.get_node({x=pos.x,y=y,z=pos.z})
 					end
-					if y == pos.y+1 then
-						if  minetest.get_item_group(node.name, "glass") ~= 0 then
-							local c = node.name:split(":")[2]:gsub("glass_","")
-							p2 = table.indexof(colors,c) - 1
-						end
+					if  minetest.get_item_group(node.name, "glass") ~= 0 then
+						local c = node.name:split(":")[2]:gsub("glass_","")
+						p2 = table.indexof(colors,c) - 1
 					end
 
 					if node.name == "air" then