diff --git a/src/nouveau/vulkan/nvk_buffer_view.c b/src/nouveau/vulkan/nvk_buffer_view.c
index fcd8e79ce59..178d605475e 100644
--- a/src/nouveau/vulkan/nvk_buffer_view.c
+++ b/src/nouveau/vulkan/nvk_buffer_view.c
@@ -97,12 +97,11 @@ nvk_DestroyBufferView(VkDevice _device,
 {
    VK_FROM_HANDLE(nvk_device, dev, _device);
    VK_FROM_HANDLE(nvk_buffer_view, view, bufferView);
-   const struct nvk_physical_device *pdev = nvk_device_physical(dev);
 
    if (!view)
       return;
 
-   if (!nvk_use_edb_buffer_views(pdev))
+   if (view->desc.image_index)
       nvk_descriptor_table_remove(dev, &dev->images, view->desc.image_index);
 
    vk_buffer_view_destroy(&dev->vk, pAllocator, &view->vk);
diff --git a/src/nouveau/vulkan/nvk_buffer_view.h b/src/nouveau/vulkan/nvk_buffer_view.h
index 1553c0d400f..733aee1d358 100644
--- a/src/nouveau/vulkan/nvk_buffer_view.h
+++ b/src/nouveau/vulkan/nvk_buffer_view.h
@@ -20,11 +20,8 @@ nvk_get_buffer_format_features(const struct nvk_physical_device *pdev,
 struct nvk_buffer_view {
    struct vk_buffer_view vk;
 
-   /* Selected based on nvk_use_edb_buffer_views() */
-   union {
-      struct nvk_buffer_view_descriptor desc;
-      struct nvk_edb_buffer_view_descriptor edb_desc;
-   };
+   struct nvk_buffer_view_descriptor desc;
+   struct nvk_edb_buffer_view_descriptor edb_desc;
 };
 
 VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_buffer_view, vk.base, VkBufferView,