diff --git a/codemp/rd-vulkan/vk_instance.cpp b/codemp/rd-vulkan/vk_instance.cpp
index ac712c44d3..240022d477 100644
--- a/codemp/rd-vulkan/vk_instance.cpp
+++ b/codemp/rd-vulkan/vk_instance.cpp
@@ -682,7 +682,8 @@ static qboolean vk_create_device( VkPhysicalDevice physical_device, int device_i
 			vk.shaderStorageImageMultisample = qtrue;
 		}
 
-		if (device_features.fragmentStoresAndAtomics) {
+		if ( device_features.fragmentStoresAndAtomics && device_features.vertexPipelineStoresAndAtomics ) {
+			features.vertexPipelineStoresAndAtomics = VK_TRUE;
 			features.fragmentStoresAndAtomics = VK_TRUE;
 			vk.fragmentStores = qtrue;
 		}
diff --git a/codemp/rd-vulkan/vk_pipelines.cpp b/codemp/rd-vulkan/vk_pipelines.cpp
index a0129b2b21..7c0c09684d 100644
--- a/codemp/rd-vulkan/vk_pipelines.cpp
+++ b/codemp/rd-vulkan/vk_pipelines.cpp
@@ -2013,6 +2013,8 @@ void vk_alloc_persistent_pipelines( void )
 #endif // USE_PMLIGHT
     }
 
+	// flare visibility test dot
+	if ( vk.fragmentStores )
     {
         Com_Memset(&def, 0, sizeof(def));
         def.face_culling = CT_TWO_SIDED;