diff --git a/models/Image.php b/models/Image.php
index 80a5cb46..99a9fbe6 100644
--- a/models/Image.php
+++ b/models/Image.php
@@ -74,7 +74,11 @@ class Image extends Asset
 		{
 			$thumbnail = new Thumbnail($this);
 			$image_urls[1] = $this->getThumbnailUrl($width, $height, false);
-			$image_urls[2] = $this->getThumbnailUrl($width * 2, $height * 2, false);
+
+			// Can we afford to generate double-density thumbnails as well?
+			if ((!isset($width) || $this->image_width >= $width * 2) &&
+				(!isset($height) || $this->image_height >= $height * 2))
+				$image_urls[2] = $this->getThumbnailUrl($width * 2, $height * 2, false);
 		}
 		else
 			$image_urls[1] = $this->getUrl();