diff --git a/mm/zswap.c b/mm/zswap.c
index 93707a1799b8a..ea921b25c245b 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -417,9 +417,9 @@ static void zswap_entry_put(struct zswap_tree *tree,
 {
 	int refcount = --entry->refcount;
 
-	BUG_ON(refcount < 0);
+	WARN_ON_ONCE(refcount < 0);
 	if (refcount == 0) {
-		zswap_rb_erase(&tree->rbroot, entry);
+		WARN_ON_ONCE(!RB_EMPTY_NODE(&entry->rbnode));
 		zswap_free_entry(entry);
 	}
 }