diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c
index 578f42c6924..7b8803b7d33 100644
--- a/src/nouveau/vulkan/nvk_buffer.c
+++ b/src/nouveau/vulkan/nvk_buffer.c
@@ -241,21 +241,14 @@ nvk_BindBufferMemory2(VkDevice device,
       buffer->is_local = !(mem->bo->flags & NOUVEAU_WS_BO_GART);
       if (buffer->vma_size_B) {
          VK_FROM_HANDLE(nvk_device, dev, device);
-         if (mem != NULL) {
-            nouveau_ws_bo_bind_vma(dev->ws_dev,
-                                   mem->bo,
-                                   buffer->addr,
-                                   buffer->vma_size_B,
-                                   pBindInfos[i].memoryOffset,
-                                   0 /* pte_kind */);
-         } else {
-            nouveau_ws_bo_unbind_vma(dev->ws_dev,
-                                     buffer->addr,
-                                     buffer->vma_size_B);
-         }
+         nouveau_ws_bo_bind_vma(dev->ws_dev,
+                                mem->bo,
+                                buffer->addr,
+                                buffer->vma_size_B,
+                                pBindInfos[i].memoryOffset,
+                                0 /* pte_kind */);
       } else {
-         buffer->addr =
-            mem != NULL ? mem->bo->offset + pBindInfos[i].memoryOffset : 0;
+         buffer->addr = mem->bo->offset + pBindInfos[i].memoryOffset;
       }
    }
    return VK_SUCCESS;
diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c
index 10875c6d5c3..227bcd08b33 100644
--- a/src/nouveau/vulkan/nvk_image.c
+++ b/src/nouveau/vulkan/nvk_image.c
@@ -830,21 +830,15 @@ nvk_image_plane_bind(struct nvk_device *dev,
    *offset_B = align64(*offset_B, (uint64_t)plane->nil.align_B);
 
    if (plane->vma_size_B) {
-      if (mem != NULL) {
-         nouveau_ws_bo_bind_vma(dev->ws_dev,
-                                mem->bo,
-                                plane->addr,
-                                plane->vma_size_B,
-                                *offset_B,
-                                plane->nil.pte_kind);
-      } else {
-         nouveau_ws_bo_unbind_vma(dev->ws_dev,
-                                  plane->addr,
-                                  plane->vma_size_B);
-      }
+      nouveau_ws_bo_bind_vma(dev->ws_dev,
+                             mem->bo,
+                             plane->addr,
+                             plane->vma_size_B,
+                             *offset_B,
+                             plane->nil.pte_kind);
    } else {
       assert(plane->nil.pte_kind == 0);
-      plane->addr = mem != NULL ? mem->bo->offset + *offset_B : 0;
+      plane->addr = mem->bo->offset + *offset_B;
    }
 
    *offset_B += plane->nil.size_B;