diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 764d67559e..d221a35cb5 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -1161,6 +1161,7 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
    VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, DestroyPipeline);
 
    VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CreateCommandPool);
+   VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, DestroyCommandPool);
 
    if (VKFUNC(vkEnumeratePhysicalDevices)(vk->context.instance,
             &gpu_count, NULL) != VK_SUCCESS)
diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h
index ec6610c341..c6625b8e67 100644
--- a/gfx/common/vulkan_common.h
+++ b/gfx/common/vulkan_common.h
@@ -168,6 +168,7 @@ typedef struct vulkan_context
 
       /* Command pools */
       PFN_vkCreateCommandPool                       vkCreateCommandPool;
+      PFN_vkDestroyCommandPool                      vkDestroyCommandPool;
 
       /* Framebuffers */
       PFN_vkCreateFramebuffer                       vkCreateFramebuffer;
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index d4c2b2d5b4..d38ef11cd5 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -529,7 +529,9 @@ static void vulkan_deinit_textures(vk_t *vk)
    }
 }
 
-static void vulkan_deinit_command_buffers(vk_t *vk)
+static void vulkan_deinit_command_buffers(
+      struct vulkan_context_fp *vkcfp,
+      vk_t *vk)
 {
    unsigned i;
    for (i = 0; i < vk->num_swapchain_images; i++)
@@ -538,7 +540,7 @@ static void vulkan_deinit_command_buffers(vk_t *vk)
          vkFreeCommandBuffers(vk->context->device,
                vk->swapchain[i].cmd_pool, 1, &vk->swapchain[i].cmd);
 
-      vkDestroyCommandPool(vk->context->device,
+      VKFUNC(vkDestroyCommandPool)(vk->context->device,
             vk->swapchain[i].cmd_pool, NULL);
    }
 }
@@ -709,7 +711,9 @@ static void vulkan_init_static_resources(vk_t *vk)
          blank, NULL, VULKAN_TEXTURE_STATIC);
 }
 
-static void vulkan_deinit_static_resources(vk_t *vk)
+static void vulkan_deinit_static_resources(
+      struct vulkan_context_fp *vkcfp,
+      vk_t *vk)
 {
    unsigned i;
    vkDestroyPipelineCache(vk->context->device,
@@ -718,7 +722,7 @@ static void vulkan_deinit_static_resources(vk_t *vk)
          vk->context->device,
          &vk->display.blank_texture);
 
-   vkDestroyCommandPool(vk->context->device, vk->staging_pool, NULL);
+   VKFUNC(vkDestroyCommandPool)(vk->context->device, vk->staging_pool, NULL);
    free(vk->hw.cmd);
    free(vk->hw.wait_dst_stages);
 
@@ -736,7 +740,7 @@ static void vulkan_deinit_resources(vk_t *vk)
    vulkan_deinit_descriptor_pool(vk);
    vulkan_deinit_textures(vk);
    vulkan_deinit_buffers(vk);
-   vulkan_deinit_command_buffers(vk);
+   vulkan_deinit_command_buffers(&vk->context->fp, vk);
 }
 
 static void vulkan_deinit_menu(vk_t *vk)
@@ -770,7 +774,7 @@ static void vulkan_free(void *data)
       vulkan_deinit_menu(vk);
       font_driver_free(NULL);
 
-      vulkan_deinit_static_resources(vk);
+      vulkan_deinit_static_resources(&vk->context->fp, vk);
       vulkan_overlay_free(vk);
 
       if (vk->filter_chain)