diff --git a/internal/photoprism/index.go b/internal/photoprism/index.go
index f19592992..d1b444e12 100644
--- a/internal/photoprism/index.go
+++ b/internal/photoprism/index.go
@@ -166,11 +166,11 @@ func (ind *Index) Start(opt IndexOptions) fs.Done {
 			var files MediaFiles
 
 			for _, f := range related.Files {
-				if done[f.FileName()].Processed() || f.FileName() == fileName {
+				if done[f.FileName()].Processed() {
 					continue
 				}
 
-				if ind.files.Ignore(f.RelName(originalsPath), f.ModTime(), opt.Rescan) {
+				if f.FileName() != fileName && ind.files.Ignore(f.RelName(originalsPath), f.ModTime(), opt.Rescan) {
 					continue
 				}
 
@@ -179,9 +179,13 @@ func (ind *Index) Start(opt IndexOptions) fs.Done {
 				done[f.FileName()] = fs.Processed
 			}
 
-			filesIndexed++
 			done[fileName] = fs.Processed
 
+			if len(files) == 0 || related.Main == nil {
+				// Nothing to do.
+				return nil
+			}
+
 			related.Files = files
 
 			jobs <- IndexJob{
diff --git a/internal/photoprism/index_mediafile.go b/internal/photoprism/index_mediafile.go
index 8f46af9c7..30b2a6cc3 100644
--- a/internal/photoprism/index_mediafile.go
+++ b/internal/photoprism/index_mediafile.go
@@ -155,7 +155,7 @@ func (ind *Index) MediaFile(m *MediaFile, o IndexOptions, originalName string) (
 		fileChanged = file.Changed(fileSize, modTime)
 
 		if fileChanged {
-			log.Debugf("index: file was modified (new size %d, old size %d, new timestamp %d, old timestamp %d)", fileSize, file.FileSize, modTime.Unix(), file.ModTime)
+			log.Debugf("index: %s was modified (new size %d, old size %d, new timestamp %d, old timestamp %d)", txt.Quote(m.BaseName()), fileSize, file.FileSize, modTime.Unix(), file.ModTime)
 		}
 	}
 
diff --git a/internal/photoprism/index_related.go b/internal/photoprism/index_related.go
index 54cde546c..29789b6d9 100644
--- a/internal/photoprism/index_related.go
+++ b/internal/photoprism/index_related.go
@@ -111,7 +111,7 @@ func IndexRelated(related RelatedFiles, ind *Index, opt IndexOptions) (result In
 			}
 		}
 
-		log.Infof("index: %s related %s file %s", res, f.FileType(), txt.Quote(f.RelName(ind.originalsPath())))
+		log.Infof("index: %s related %s file %s", res, f.FileType(), txt.Quote(f.BaseName()))
 	}
 
 	return result