diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index bb6abf3ef3..272ef28008 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -677,8 +677,8 @@ _list_item_process(Eo *obj, Efl_Ui_List_Data *pd, EINA_UNUSED Efl_Ui_List_Item *
    EFL_UI_LIST_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
 
    //FIXME: This is tricky workaround for set select mode and parent value.
-   EFL_UI_LIST_ITEM_DATA_GET(it, ld);
-   EFL_UI_ITEM_DATA_GET(it, id);
+   EFL_UI_LIST_ITEM_DATA_GET_OR_RETURN(it, ld, EINA_FALSE);
+   EFL_UI_ITEM_DATA_GET_OR_RETURN(it, id, EINA_FALSE);
    id->select_mode = &(pd->select_mode);
    id->parent = obj;
    ld->parent = obj;
@@ -697,8 +697,8 @@ static void
 _list_item_clear(Eo *obj, Efl_Ui_List_Data *pd EINA_UNUSED, EINA_UNUSED Efl_Ui_List_Item *it)
 {
    EFL_UI_LIST_ITEM_CHECK_OR_RETURN(it);
-   EFL_UI_LIST_ITEM_DATA_GET(it, ld);
-   EFL_UI_ITEM_DATA_GET(it, id);
+   EFL_UI_LIST_ITEM_DATA_GET_OR_RETURN(it, ld);
+   EFL_UI_ITEM_DATA_GET_OR_RETURN(it, id);
    id->select_mode = NULL;
    id->parent = NULL;
    ld->parent = NULL;