diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index b1f3f9cb83e..627e77ad5bc 100644
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -118,6 +118,7 @@ void etna_bo_free(struct etna_bo *bo) {
 	if (dev->use_softpin) {
 		etna_bo_cleanup_zombies(dev);
 		VG_BO_RELEASE(bo);
+		assert(!list_is_linked(&bo->list));
 		list_addtail(&bo->list, &dev->zombie_list);
 	} else {
 		_etna_bo_free(bo);
diff --git a/src/etnaviv/drm/etnaviv_bo_cache.c b/src/etnaviv/drm/etnaviv_bo_cache.c
index 1d0af059db9..0930f3afa1c 100644
--- a/src/etnaviv/drm/etnaviv_bo_cache.c
+++ b/src/etnaviv/drm/etnaviv_bo_cache.c
@@ -185,6 +185,7 @@ int etna_bo_cache_free(struct etna_bo_cache *cache, struct etna_bo *bo)
 
 		bo->free_time = time.tv_sec;
 		VG_BO_RELEASE(bo);
+		assert(!list_is_linked(&bo->list));
 		list_addtail(&bo->list, &bucket->list);
 		etna_bo_cache_cleanup(cache, time.tv_sec);