diff --git a/src/system/kernel/util/khash.cpp b/src/system/kernel/util/khash.cpp
index dded1ade732..f21835411a8 100644
--- a/src/system/kernel/util/khash.cpp
+++ b/src/system/kernel/util/khash.cpp
@@ -253,6 +253,13 @@ hash_remove_current(struct hash_table *table, struct hash_iterator *iterator)
 			} else {
 				table->table[index] = (struct hash_element *)NEXT(table,
 					element);
+
+				// We need to rewind the bucket, as hash_next() advances to the
+				// next bucket when iterator->current is NULL. With this we
+				// basically move the iterator between the end of the last
+				// bucket and before the start of this one so hash_next()
+				// doesn't skip the rest of this bucket.
+				iterator->bucket--;
 			}
 
 			table->num_elements--;