1diff --git a/pkg/database/sql/media.go b/pkg/database/sql/media.go
 2index b13e267211958c82af7dafd03db2bd0b750cb5a4..16769bfc261774f6ac25ed4cf898917d5566232e 100644
 3--- a/pkg/database/sql/media.go
 4+++ b/pkg/database/sql/media.go
 5@@ -164,7 +164,8 @@ 		Model(&Media{}).
 6 		Offset(pagination.Page * pagination.Size).
 7 		Limit(pagination.Size).
 8 		Where("path like '" + pagination.Path + "%'").
 9-		Order("created_at DESC").
10+		Order("COALESCE (media_exifs.date_shot, media.created_at) DESC").
11+		InnerJoins("INNER JOIN media_exifs ON media_exifs.media_id = media.id").
12 		Find(&medias)
13 
14 	if result.Error != nil {