1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index d52069d85c..5bb2fbb50a 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -4244,10 +4244,13 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
         return;
      }
 
-   if ((ep->calculated & FLAG_XY) == FLAG_XY && !state)
+   EINA_SAFETY_ON_FALSE_RETURN(flags != FLAG_NONE);
+   if (!state)
      {
-        return;
+        if ((ep->calculated & FLAG_XY) == FLAG_XY) return;
+        if ((ep->calculated & flags) == flags) return;
      }
+
    if (ep->calculating & flags)
      {
 #if 1