diff --git a/libs/util/include/psemek/util/hash_table.hpp b/libs/util/include/psemek/util/hash_table.hpp
index c9b95bc2..af9cf130 100644
--- a/libs/util/include/psemek/util/hash_table.hpp
+++ b/libs/util/include/psemek/util/hash_table.hpp
@@ -129,6 +129,8 @@ namespace psemek::util
 			template <typename Key>
 			hash_table_iterator<T> find(Key const & key) const
 			{
+				if (size_ == 0)
+					return end();
 				std::size_t hash = this->hash()(key);
 				return find_impl(key, hash);
 			}