diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
index 4e335fe287..77e60aca97 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
@@ -159,9 +159,10 @@ ecore_evas_data_set(Ecore_Evas *ee, const char *key, const void *data)
      }
 
    if (!key) return;
-
+   
    ee->data = evas_hash_del(ee->data, key, NULL);
-   ee->data = evas_hash_add(ee->data, key, data);
+   if (data)
+     ee->data = evas_hash_add(ee->data, key, data);
 }
 
 #define IFC(_ee, _fn)  if (_ee->engine.func->_fn) {_ee->engine.func->_fn