diff --git a/src/backend/model/database/sql/PreviewManager.ts b/src/backend/model/database/sql/PreviewManager.ts
index 7f828745..0e4c857b 100644
--- a/src/backend/model/database/sql/PreviewManager.ts
+++ b/src/backend/model/database/sql/PreviewManager.ts
@@ -24,16 +24,16 @@ export class PreviewManager implements IPreviewManager {
     for (const sort of Config.Server.Preview.Sorting) {
       switch (sort) {
         case SortingMethods.descDate:
-          query.addOrderBy('media.creationDate', 'DESC');
+          query.addOrderBy('media.metadata.creationDate', 'DESC');
           break;
         case SortingMethods.ascDate:
-          query.addOrderBy('media.creationDate', 'ASC');
+          query.addOrderBy('media.metadata.creationDate', 'ASC');
           break;
         case SortingMethods.descRating:
-          query.addOrderBy('media.rating', 'DESC');
+          query.addOrderBy('media.metadata.rating', 'DESC');
           break;
         case SortingMethods.ascRating:
-          query.addOrderBy('media.rating', 'ASC');
+          query.addOrderBy('media.metadata.rating', 'ASC');
           break;
         case SortingMethods.descName:
           query.addOrderBy('media.name', 'DESC');
diff --git a/test/backend/unit/model/sql/PreviewManager.spec.ts b/test/backend/unit/model/sql/PreviewManager.spec.ts
index d88037ca..b2a65e3e 100644
--- a/test/backend/unit/model/sql/PreviewManager.spec.ts
+++ b/test/backend/unit/model/sql/PreviewManager.spec.ts
@@ -184,6 +184,8 @@ describe('PreviewManager', (sqlHelper: DBTestHelper) => {
     expect(Utils.clone(await pm.setAndGetPreviewForDirectory(subDir))).to.deep.equalInAnyOrder(previewifyMedia(pFaceLess));
     Config.Server.Preview.Sorting = [SortingMethods.descRating];
     expect(Utils.clone(await pm.setAndGetPreviewForDirectory(dir))).to.deep.equalInAnyOrder(previewifyMedia(p4));
+    Config.Server.Preview.Sorting = [SortingMethods.descName];
+    expect(Utils.clone(await pm.setAndGetPreviewForDirectory(dir))).to.deep.equalInAnyOrder(previewifyMedia(v));
   });
 
   it('should get preview for directory', async () => {