diff --git a/libs/util/include/psemek/util/hash_table.hpp b/libs/util/include/psemek/util/hash_table.hpp
index e815b0df..2de28b0e 100644
--- a/libs/util/include/psemek/util/hash_table.hpp
+++ b/libs/util/include/psemek/util/hash_table.hpp
@@ -234,6 +234,12 @@ namespace psemek::util
 				for (auto & entry : storage_.entries())
 					entry.reset();
 				size_ = 0;
+				tombstone_count_ = 0;
+			}
+
+			~hash_table_impl()
+			{
+				clear();
 			}
 
 			hash_table_iterator<T> begin() const