diff --git a/.pick_status.json b/.pick_status.json
index f2101cc9239..51e0b3c99ca 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4486,7 +4486,7 @@
         "description": "etnaviv: drm: fix check if BO is on a deferred destroy list",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "1b1f8592c03c7e98b7baf89cb4d012bb7af546ac"
     },
diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index d790823bcb7..aae81a015b1 100644
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -138,8 +138,8 @@ static struct etna_bo *lookup_bo(void *tbl, uint32_t handle)
 		/* found, incr refcnt and return: */
 		bo = etna_bo_ref(entry->data);
 
-		/* don't break the bucket if this bo was found in one */
-		if (list_is_linked(&bo->list)) {
+		/* don't break the bucket/zombie list if this bo was found in one */
+		if (!list_is_empty(&bo->list)) {
 			VG_BO_OBTAIN(bo);
 			etna_device_ref(bo->dev);
 			list_delinit(&bo->list);