diff --git a/src/Object/Image.php b/src/Object/Image.php
index 430ad6f139..67a1af3d1e 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -285,12 +285,13 @@ class Image
 		$width = $this->getWidth();
 		$height = $this->getHeight();
 
-		if ((! $width)|| (! $height)) {
+		$scale = Images::getScalingDimensions($width, $height,$max);
+		if ($scale) {
+			return $this->scale($scale['width'], $scale['height']);
+		} else {
 			return false;
 		}
 
-		$scale = Images::getScalingDimensions($width, $height,$max);
-		return $this->scale($scale['width'], $scale['height']);
 	}
 
 	/**