diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 3cdbe848b3..974b6dd22a 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -1978,8 +1978,8 @@ _edje_part_recalc_single(Edje *ed,
           }
         if (((Edje_Part_Description_Image *)chosen_desc)->image.max.limit)
           {
-             if (w < maxw) maxw = w;
-             if (h < maxh) maxh = h;
+             if ((maxw <= 0) || (w < maxw)) maxw = w;
+             if ((maxh <= 0) || (h < maxh)) maxh = h;
           }
      }