diff --git a/src/rendering/vulkan/textures/vk_hwtexture.cpp b/src/rendering/vulkan/textures/vk_hwtexture.cpp
index 0e6d58b31..f7d0f022a 100644
--- a/src/rendering/vulkan/textures/vk_hwtexture.cpp
+++ b/src/rendering/vulkan/textures/vk_hwtexture.cpp
@@ -121,14 +121,22 @@ VulkanDescriptorSet *VkHardwareTexture::GetDescriptorSet(const FMaterialState &s
 		VulkanSampler *sampler = fb->GetSamplerManager()->Get(clampmode);
 		int numLayers = mat->GetLayers();
 
+		int maxTextures = 6;
+		auto baseView = GetImageView(tex, translation, flags);
+		numLayers = clamp(numLayers, 1, maxTextures);
+
 		WriteDescriptors update;
-		update.addCombinedImageSampler(descriptorSet.get(), 0, GetImageView(tex, translation, flags), sampler, mImageLayout);
+		update.addCombinedImageSampler(descriptorSet.get(), 0, baseView, sampler, mImageLayout);
 		for (int i = 1; i < numLayers; i++)
 		{
 			FTexture *layer;
 			auto systex = static_cast<VkHardwareTexture*>(mat->GetLayer(i, 0, &layer));
 			update.addCombinedImageSampler(descriptorSet.get(), i, systex->GetImageView(layer, 0, mat->isExpanded() ? CTF_Expand : 0), sampler, systex->mImageLayout);
 		}
+		for (int i = numLayers; i < maxTextures; i++)
+		{
+			update.addCombinedImageSampler(descriptorSet.get(), i, baseView, sampler, mImageLayout);
+		}
 		update.updateSets(fb->device);
 	}