diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index cfca448e50..3dd638a7d4 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -2753,6 +2753,13 @@ elm_gengrid_item_update(Elm_Object_Item *item)
 EAPI const Elm_Gengrid_Item_Class *
 elm_gengrid_item_item_class_get(const Elm_Object_Item *it)
 {
+   Elm_Gen_Item *item = (Elm_Gen_Item *)it;
+
+   ELM_GENGRID_ITEM_CHECK_OR_RETURN(it, NULL);
+
+   if (item->generation < GG_IT(item)->wsd->generation) return NULL;
+   return item->itc;
+
    return (Elm_Gengrid_Item_Class *)elm_gengrid_item_item_class_get(it);
 }