diff --git a/internal/classify/label.go b/internal/classify/label.go
index 3b445f232..2dd27ca95 100644
--- a/internal/classify/label.go
+++ b/internal/classify/label.go
@@ -1,9 +1,10 @@
 package classify
 
 import (
-	"github.com/photoprism/photoprism/internal/face"
 	"strings"
 
+	"github.com/photoprism/photoprism/internal/face"
+
 	"github.com/photoprism/photoprism/pkg/txt"
 )
 
diff --git a/internal/photoprism/index_mediafile.go b/internal/photoprism/index_mediafile.go
index bb501dfde..09ae085c8 100644
--- a/internal/photoprism/index_mediafile.go
+++ b/internal/photoprism/index_mediafile.go
@@ -835,11 +835,24 @@ func (ind *Index) detectFaces(jpeg *MediaFile) face.Faces {
 		return face.Faces{}
 	}
 
-	// TODO: Not all users have thumbs with this resolution.
-	thumbName, err := jpeg.Thumbnail(Config().ThumbPath(), "fit_1280")
+	var thumbSize string
+
+	// Select best thumbnail depending on configured size.
+	if Config().ThumbSize() < 1280 {
+		thumbSize = "fit_720"
+	} else {
+		thumbSize = "fit_1280"
+	}
+
+	thumbName, err := jpeg.Thumbnail(Config().ThumbPath(), thumbSize)
 
 	if err != nil {
-		log.Debugf("%s in %s", err, txt.Quote(jpeg.BaseName()))
+		log.Debugf("index: %s in %s (faces)", err, txt.Quote(jpeg.BaseName()))
+		return face.Faces{}
+	}
+
+	if thumbName == "" {
+		log.Debugf("index: thumb %s not found in %s (faces)", thumbSize, txt.Quote(jpeg.BaseName()))
 		return face.Faces{}
 	}