diff --git a/server/e2e/api/specs/search.e2e-spec.ts b/server/e2e/api/specs/search.e2e-spec.ts
index 5d72411838..3b73b29524 100644
--- a/server/e2e/api/specs/search.e2e-spec.ts
+++ b/server/e2e/api/specs/search.e2e-spec.ts
@@ -212,4 +212,81 @@ describe(`${SearchController.name}`, () => {
       });
     });
   });
+
+  describe('GET /search (file name)', () => {
+    beforeEach(async () => {
+      const assetId = (await assetRepository.create(generateAsset(loginResponse.userId, libraries))).id;
+      await assetRepository.upsertExif({ assetId, ...searchStub.exif });
+
+      const assetWithMetadata = await assetRepository.getById(assetId, { exifInfo: true });
+      if (!assetWithMetadata) {
+        throw new Error('Asset not found');
+      }
+      asset1 = mapAsset(assetWithMetadata);
+    });
+
+    it('should return assets when searching by file name', async () => {
+      if (asset1?.originalFileName.length === 0) {
+        throw new Error('Asset 1 does not have an original file name');
+      }
+
+      const { status, body } = await request(server)
+        .get('/search')
+        .set('Authorization', `Bearer ${accessToken}`)
+        .query({ q: asset1.originalFileName });
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        albums: {
+          total: 0,
+          count: 0,
+          items: [],
+          facets: [],
+        },
+        assets: {
+          total: 1,
+          count: 1,
+          items: [
+            {
+              id: asset1.id,
+              originalFileName: asset1.originalFileName,
+            },
+          ],
+          facets: [],
+        },
+      });
+    });
+
+    it('should return assets when searching by file name with extension', async () => {
+      if (asset1?.originalFileName.length === 0) {
+        throw new Error('Asset 1 does not have an original file name');
+      }
+
+      const { status, body } = await request(server)
+        .get('/search')
+        .set('Authorization', `Bearer ${accessToken}`)
+        .query({ q: asset1.originalFileName + '.jpg' });
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        albums: {
+          total: 0,
+          count: 0,
+          items: [],
+          facets: [],
+        },
+        assets: {
+          total: 1,
+          count: 1,
+          items: [
+            {
+              id: asset1.id,
+              originalFileName: asset1.originalFileName,
+            },
+          ],
+          facets: [],
+        },
+      });
+    });
+  });
 });
diff --git a/server/src/infra/entities/asset.entity.ts b/server/src/infra/entities/asset.entity.ts
index 07de006858..ea1ed123f1 100644
--- a/server/src/infra/entities/asset.entity.ts
+++ b/server/src/infra/entities/asset.entity.ts
@@ -127,6 +127,7 @@ export class AssetEntity {
   livePhotoVideoId!: string | null;
 
   @Column({ type: 'varchar' })
+  @Index()
   originalFileName!: string;
 
   @Column({ type: 'varchar', nullable: true })
diff --git a/server/src/infra/migrations/1705306747072-AddOriginalFileNameIndex.ts b/server/src/infra/migrations/1705306747072-AddOriginalFileNameIndex.ts
new file mode 100644
index 0000000000..b465d42943
--- /dev/null
+++ b/server/src/infra/migrations/1705306747072-AddOriginalFileNameIndex.ts
@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddOriginalFileNameIndex1705306747072 implements MigrationInterface {
+  name = 'AddOriginalFileNameIndex1705306747072';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE INDEX "IDX_4d66e76dada1ca180f67a205dc" ON "assets" ("originalFileName") `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "public"."IDX_4d66e76dada1ca180f67a205dc"`);
+  }
+}
diff --git a/server/src/infra/repositories/asset.repository.ts b/server/src/infra/repositories/asset.repository.ts
index 6e18048716..edff22e4a7 100644
--- a/server/src/infra/repositories/asset.repository.ts
+++ b/server/src/infra/repositories/asset.repository.ts
@@ -24,7 +24,8 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import _ from 'lodash';
 import { DateTime } from 'luxon';
-import { And, FindOptionsRelations, FindOptionsWhere, In, IsNull, LessThan, Not, Repository } from 'typeorm';
+import path from 'path';
+import { And, Brackets, FindOptionsRelations, FindOptionsWhere, In, IsNull, LessThan, Not, Repository } from 'typeorm';
 import { AssetEntity, AssetJobStatusEntity, AssetType, ExifEntity, SmartInfoEntity } from '../entities';
 import { DummyValue, GenerateSql } from '../infra.util';
 import { Chunked, ChunkedArray, OptionalBetween, paginate } from '../infra.utils';
@@ -820,9 +821,13 @@ export class AssetRepository implements IAssetRepository {
       .innerJoin('exif', 'e', 'asset."id" = e."assetId"')
       .leftJoin('smart_info', 'si', 'si."assetId" = asset."id"')
       .andWhere(
-        `(e."exifTextSearchableColumn" || COALESCE(si."smartInfoTextSearchableColumn", to_tsvector('english', '')))
-        @@ PLAINTO_TSQUERY('english', :query)`,
-        { query },
+        new Brackets((qb) => {
+          qb.where(
+            `(e."exifTextSearchableColumn" || COALESCE(si."smartInfoTextSearchableColumn", to_tsvector('english', '')))
+          @@ PLAINTO_TSQUERY('english', :query)`,
+            { query },
+          ).orWhere('asset."originalFileName" = :path', { path: path.parse(query).name });
+        }),
       )
       .addOrderBy('asset.fileCreatedAt', 'DESC')
       .limit(numResults)
diff --git a/server/src/infra/sql/asset.repository.sql b/server/src/infra/sql/asset.repository.sql
index f36ec07645..16e13208ea 100644
--- a/server/src/infra/sql/asset.repository.sql
+++ b/server/src/infra/sql/asset.repository.sql
@@ -765,11 +765,14 @@ WHERE
     AND "asset"."ownerId" IN ($1)
     AND "asset"."isArchived" = $2
     AND (
-      e."exifTextSearchableColumn" || COALESCE(
-        si."smartInfoTextSearchableColumn",
-        to_tsvector('english', '')
-      )
-    ) @@ PLAINTO_TSQUERY('english', $3)
+      (
+        e."exifTextSearchableColumn" || COALESCE(
+          si."smartInfoTextSearchableColumn",
+          to_tsvector('english', '')
+        )
+      ) @@ PLAINTO_TSQUERY('english', $3)
+      OR asset."originalFileName" = $4
+    )
   )
   AND ("asset"."deletedAt" IS NULL)
 ORDER BY