diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -792,7 +792,7 @@
 {
    Eina_Bool invalidate;
    EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_TRUE);
-   invalidate = obj->invalidate;
+   invalidate = obj->invalidate || obj->is_invalidating;
    EO_OBJ_DONE(obj_id);
    return invalidate;
 }