diff --git a/src/common/rendering/vulkan/vk_renderdevice.cpp b/src/common/rendering/vulkan/vk_renderdevice.cpp
index e14eb8fd1..5a2983c6d 100644
--- a/src/common/rendering/vulkan/vk_renderdevice.cpp
+++ b/src/common/rendering/vulkan/vk_renderdevice.cpp
@@ -84,6 +84,11 @@ CUSTOM_CVAR(Int, vk_device, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCAL
 	Printf("This won't take effect until " GAMENAME " is restarted.\n");
 }
 
+CUSTOM_CVAR(Bool, vk_rayquery, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
+{
+	Printf("This won't take effect until " GAMENAME " is restarted.\n");
+}
+
 CCMD(vk_listdevices)
 {
 	for (size_t i = 0; i < SupportedDevices.size(); i++)
@@ -118,7 +123,8 @@ void VulkanPrintLog(const char* typestr, const std::string& msg)
 VulkanRenderDevice::VulkanRenderDevice(void *hMonitor, bool fullscreen, std::shared_ptr<VulkanSurface> surface) : SystemBaseFrameBuffer(hMonitor, fullscreen)
 {
 	VulkanDeviceBuilder builder;
-	builder.OptionalRayQuery();
+	if (vk_rayquery)
+		builder.OptionalRayQuery();
 	builder.RequireExtension(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME);
 	builder.Surface(surface);
 	builder.SelectDevice(vk_device);
diff --git a/wadsrc/static/shaders/lightmap/trace_levelmesh.glsl b/wadsrc/static/shaders/lightmap/trace_levelmesh.glsl
index f5f08832c..73884c862 100644
--- a/wadsrc/static/shaders/lightmap/trace_levelmesh.glsl
+++ b/wadsrc/static/shaders/lightmap/trace_levelmesh.glsl
@@ -7,9 +7,9 @@ vec4 blend(vec4 a, vec4 b);
 
 int TraceFirstHitTriangleT(vec3 origin, float tmin, vec3 dir, float tmax, out float t)
 {
-	int primitiveID;
+	int primitiveID = -1;
 	vec3 primitiveWeights;
-	while(true)
+	for (int i = 0; i < 4; i++)
 	{
 		primitiveID = TraceFirstHitTriangleNoPortal(origin, tmin, dir, tmax, t, primitiveWeights);
 
@@ -22,7 +22,6 @@ int TraceFirstHitTriangleT(vec3 origin, float tmin, vec3 dir, float tmax, out fl
 
 		if(surface.PortalIndex == 0)
 		{
-#if defined(USE_RAYQUERY)
 			int index = primitiveID * 3;
 			vec2 uv = vertices[elements[index + 1]].uv * primitiveWeights.x + vertices[elements[index + 2]].uv * primitiveWeights.y + vertices[elements[index + 0]].uv * primitiveWeights.z;
 
@@ -40,9 +39,6 @@ int TraceFirstHitTriangleT(vec3 origin, float tmin, vec3 dir, float tmax, out fl
 			}
 
 			rayColor = blend(color, rayColor);
-#else
-			break;
-#endif
 		}
 
 		// Portal was hit: Apply transformation onto the ray
@@ -71,7 +67,7 @@ bool TracePoint(vec3 origin, vec3 target, float tmin, vec3 dir, float tmax)
 	int primitiveID;
 	float t;
 	vec3 primitiveWeights;
-	while(true)
+	for (int i = 0; i < 4; i++)
 	{
 		t = tmax;
 		primitiveID = TraceFirstHitTriangleNoPortal(origin, tmin, dir, tmax, t, primitiveWeights);
@@ -89,7 +85,6 @@ bool TracePoint(vec3 origin, vec3 target, float tmin, vec3 dir, float tmax)
 
 		if (surface.PortalIndex == 0)
 		{
-#if defined(USE_RAYQUERY)
 			int index = primitiveID * 3;
 			vec2 uv = vertices[elements[index + 1]].uv * primitiveWeights.x + vertices[elements[index + 2]].uv * primitiveWeights.y + vertices[elements[index + 0]].uv * primitiveWeights.z;
 
@@ -107,10 +102,6 @@ bool TracePoint(vec3 origin, vec3 target, float tmin, vec3 dir, float tmax)
 			}
 
 			rayColor = blend(color, rayColor);
-#else
-			rayColor.w = 0; // I suspect some rays are escaping out of bounds
-			break;
-#endif
 		}
 
 		if(dot(surface.Normal, dir) >= 0.0)
@@ -121,12 +112,6 @@ bool TracePoint(vec3 origin, vec3 target, float tmin, vec3 dir, float tmax)
 		mat4 transformationMatrix = portals[surface.PortalIndex].Transformation;
 		origin = (transformationMatrix * vec4(origin, 1.0)).xyz;
 		dir = (transformationMatrix * vec4(dir, 0.0)).xyz;
-
-#if defined(USE_RAYQUERY)
-#else
-		origin += dir * tmin;
-		tmax -= tmin;
-#endif
 	}
 
 	return distance(origin, target) <= 1.0;