diff --git a/lib/bdev/null/bdev_null.c b/lib/bdev/null/bdev_null.c
index c66c86c5f..39520b0c0 100644
--- a/lib/bdev/null/bdev_null.c
+++ b/lib/bdev/null/bdev_null.c
@@ -267,8 +267,7 @@ bdev_null_finish(void)
 	struct null_bdev *bdev, *tmp;
 
 	TAILQ_FOREACH_SAFE(bdev, &g_null_bdev_head, tailq, tmp) {
-		TAILQ_REMOVE(&g_null_bdev_head, bdev, tailq);
-		spdk_dma_free(bdev);
+		bdev_null_destruct(bdev);
 	}
 }