diff --git a/.pick_status.json b/.pick_status.json
index dddbf7baa7e..98798ce59a4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -940,7 +940,7 @@
         "description": "etnaviv: drm: properly handle reviving BOs via a lookup",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index 86c0e9afb4f..9372808b8f2 100644
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -86,7 +86,11 @@ static struct etna_bo *lookup_bo(void *tbl, uint32_t handle)
 		bo = etna_bo_ref(entry->data);
 
 		/* don't break the bucket if this bo was found in one */
-		list_delinit(&bo->list);
+		if (list_is_linked(&bo->list)) {
+			VG_BO_OBTAIN(bo);
+			etna_device_ref(bo->dev);
+			list_delinit(&bo->list);
+		}
 	}
 
 	return bo;