diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 6d490f51174e2b42d6612027bad84fec02f9d998..81edf1ab38ab8aa1fabc3df799bf2ac8b2234e8f 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -737,6 +737,8 @@ int rhashtable_walk_start_check(struct rhashtable_iter *iter)
 
 	if (!iter->walker.tbl && !iter->end_of_table) {
 		iter->walker.tbl = rht_dereference_rcu(ht->tbl, ht);
+		iter->slot = 0;
+		iter->skip = 0;
 		return -EAGAIN;
 	}