diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
index 823697dd55..610e7140e0 100644
--- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
@@ -211,6 +211,9 @@ namespace
 {
 	VkRenderPass precompute_render_pass(VkDevice dev, VkFormat color_format, u8 number_of_color_surface, VkFormat depth_format)
 	{
+		// Some driver crashes when using empty render pass
+		if (number_of_color_surface == 0 && depth_format == VK_FORMAT_UNDEFINED)
+			return nullptr;
 		/* Describe a render pass and framebuffer attachments */
 		std::vector<VkAttachmentDescription> attachments = {};
 		std::vector<VkAttachmentReference> attachment_references;
@@ -454,6 +457,11 @@ VKGSRender::~VKGSRender()
 	//TODO: Properly destroy shader modules instead of calling clear...
 	m_prog_buffer.clear();
 
+	m_index_buffer.release();
+	m_uniform_buffer.release();
+
+
+
 	for (auto &render_pass : m_render_passes)
 		if (render_pass)
 			vkDestroyRenderPass(*m_device, render_pass, nullptr);