diff --git a/server/src/database.ts b/server/src/database.ts
index 927b9e5f7b..4435a17871 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -1,5 +1,5 @@
 import { Selectable } from 'kysely';
-import { Exif as DatabaseExif } from 'src/db';
+import { AssetJobStatus as DatabaseAssetJobStatus, Exif as DatabaseExif } from 'src/db';
 import { AssetEntity } from 'src/entities/asset.entity';
 import {
   AlbumUserRole,
@@ -249,6 +249,10 @@ export type AssetFace = {
   person?: Person | null;
 };
 
+export type AssetJobStatus = Selectable<DatabaseAssetJobStatus> & {
+  asset: AssetEntity;
+};
+
 const userColumns = ['id', 'name', 'email', 'profileImagePath', 'profileChangedAt'] as const;
 
 export const columns = {
diff --git a/server/src/entities/asset-job-status.entity.ts b/server/src/entities/asset-job-status.entity.ts
deleted file mode 100644
index 2cccfcab3a..0000000000
--- a/server/src/entities/asset-job-status.entity.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { AssetEntity } from 'src/entities/asset.entity';
-
-export class AssetJobStatusEntity {
-  asset!: AssetEntity;
-  assetId!: string;
-  facesRecognizedAt!: Date | null;
-  metadataExtractedAt!: Date | null;
-  duplicatesDetectedAt!: Date | null;
-  previewAt!: Date | null;
-  thumbnailAt!: Date | null;
-}
diff --git a/server/src/entities/asset.entity.ts b/server/src/entities/asset.entity.ts
index 981e5dc800..7a2e722eaa 100644
--- a/server/src/entities/asset.entity.ts
+++ b/server/src/entities/asset.entity.ts
@@ -1,9 +1,8 @@
 import { DeduplicateJoinsPlugin, ExpressionBuilder, Kysely, SelectQueryBuilder, sql } from 'kysely';
 import { jsonArrayFrom, jsonObjectFrom } from 'kysely/helpers/postgres';
-import { AssetFace, AssetFile, Exif, Stack, Tag, User } from 'src/database';
+import { AssetFace, AssetFile, AssetJobStatus, Exif, Stack, Tag, User } from 'src/database';
 import { DB } from 'src/db';
 import { AlbumEntity } from 'src/entities/album.entity';
-import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { AssetFileType, AssetStatus, AssetType } from 'src/enum';
 import { TimeBucketSize } from 'src/repositories/asset.repository';
@@ -50,7 +49,7 @@ export class AssetEntity {
   faces!: AssetFace[];
   stackId?: string | null;
   stack?: Stack | null;
-  jobStatus?: AssetJobStatusEntity;
+  jobStatus?: AssetJobStatus;
   duplicateId!: string | null;
 }