diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 968883f2b8..91ba653744 100644
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -98,6 +98,7 @@ class File_thumbnail extends Managed_DataObject
         if ($notNullUrl) {
             $thumb->whereAdd('url IS NOT NULL');
         }
+        $thumb->orderBy('modified ASC');    // the first created, a somewhat ugly hack
         $thumb->limit(1);
         if (!$thumb->find(true)) {
             throw new NoResultException($thumb);