diff --git a/src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp b/src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp
index f59cbd1f5..29d05b545 100644
--- a/src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp
+++ b/src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp
@@ -94,7 +94,7 @@ void VkLightmap::BeginFrame()
 
 void VkLightmap::Raytrace(const TArray<LevelMeshSurface*>& surfaces)
 {
-	if (surfaces.Size())
+	if (mesh && surfaces.Size() > 0)
 	{
 		lightmapRaytraceLast.active = true;
 
diff --git a/src/common/rendering/vulkan/vk_renderdevice.cpp b/src/common/rendering/vulkan/vk_renderdevice.cpp
index dd16c06b8..3d06592b4 100644
--- a/src/common/rendering/vulkan/vk_renderdevice.cpp
+++ b/src/common/rendering/vulkan/vk_renderdevice.cpp
@@ -540,10 +540,7 @@ void VulkanRenderDevice::SetLevelMesh(LevelMesh* mesh)
 
 void VulkanRenderDevice::UpdateLightmaps(const TArray<LevelMeshSurface*>& surfaces)
 {
-	if (surfaces.Size() > 0 && levelMesh)
-	{
-		GetLightmap()->Raytrace(surfaces);
-	}
+	GetLightmap()->Raytrace(surfaces);
 }
 
 void VulkanRenderDevice::SetShadowMaps(const TArray<float>& lights, hwrenderer::LevelAABBTree* tree, bool newTree)