diff --git a/legacy/eina/ChangeLog b/legacy/eina/ChangeLog
index 638b828e71..8f0b210b09 100644
--- a/legacy/eina/ChangeLog
+++ b/legacy/eina/ChangeLog
@@ -177,3 +177,7 @@
 2011-12-30  Vincent Torri
 
 	* Add Eina_Semaphore abstraction API.
+
+2011-12-30  Cedric Bail
+
+	* Let eina_hash_free behave like free.
diff --git a/legacy/eina/src/lib/eina_hash.c b/legacy/eina/src/lib/eina_hash.c
index 78c64831ed..51968945d1 100644
--- a/legacy/eina/src/lib/eina_hash.c
+++ b/legacy/eina/src/lib/eina_hash.c
@@ -872,8 +872,9 @@ eina_hash_free_buckets(Eina_Hash *hash)
 {
    int i;
 
+   if (!hash) return ;
+
    EINA_MAGIC_CHECK_HASH(hash);
-   EINA_SAFETY_ON_NULL_RETURN(hash);
 
    if (hash->buckets)
      {