diff --git a/server/backend/internal/store/store.go b/server/backend/internal/store/store.go
index 9463471..6bc78f4 100644
--- a/server/backend/internal/store/store.go
+++ b/server/backend/internal/store/store.go
@@ -386,7 +386,7 @@ func (s *MediaStore) List(ctx context.Context, tenantID, ownerUserID string) ([]
 	if ownerUserID != "" {
 		rows, err = s.pool.Query(ctx, base+` AND m.created_by_user_id=$2 ORDER BY m.created_at DESC`, tenantID, ownerUserID)
 	} else {
-		rows, err = s.pool.Query(ctx, base+` ORDER BY m.created_at DESC`, tenantID)
+		rows, err = s.pool.Query(ctx, base+` ORDER BY u.username NULLS LAST, m.created_at DESC`, tenantID)
 	}
 	if err != nil {
 		return nil, err