diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 5922d1b673..4739a1121e 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -169,9 +169,9 @@ _evas_object_text_item_del(Evas_Object_Text *o, Evas_Object_Text_Item *it)
    else if (o->last_computed.ellipsis_end == it)
      o->last_computed.ellipsis_end = NULL;
 
-   o->items = (Evas_Object_Text_Item *) eina_inlist_remove(
-         EINA_INLIST_GET(o->items),
-         EINA_INLIST_GET(it));
+   if (EINA_INLIST_GET(it)->last)
+     o->items = (Evas_Object_Text_Item *)eina_inlist_remove
+     (EINA_INLIST_GET(o->items), EINA_INLIST_GET(it));
    _evas_object_text_item_clean(it);
    free(it);
 }