diff --git a/docs/docs/administration/repair-page.md b/docs/docs/administration/repair-page.md
index e5022970a..f230c6d58 100644
--- a/docs/docs/administration/repair-page.md
+++ b/docs/docs/administration/repair-page.md
@@ -18,7 +18,7 @@ In any other situation, there are 3 different options that can appear:
 
 - MATCHES - These files are matched by their checksums.
 
-- OFFLINE PATHS - These files are the result of manually deleting files in the upload library or a failed file move in the past (losing track of a file).
+- OFFLINE PATHS - These files are the result of manually deleting files from immich or a failed file move in the past (losing track of a file).
 
 - UNTRACKED FILES - These files are not tracked by the application. They can be the result of failed moves, interrupted uploads, or left behind due to a bug.
 
diff --git a/docs/docs/features/libraries.md b/docs/docs/features/libraries.md
index 40b4b56b0..782dfdac1 100644
--- a/docs/docs/features/libraries.md
+++ b/docs/docs/features/libraries.md
@@ -4,10 +4,6 @@
 
 Immich supports the creation of libraries which is a top-level asset container. Currently, there are two types of libraries: traditional upload libraries that can sync with a mobile device, and external libraries, that keeps up to date with files on disk. Libraries are different from albums in that an asset can belong to multiple albums but only one library, and deleting a library deletes all assets contained within. As of August 2023, this is a new feature and libraries have a lot of potential for future development beyond what is documented here. This document attempts to describe the current state of libraries.
 
-## The Upload Library
-
-Immich comes preconfigured with an upload library for each user. All assets uploaded to Immich are added to this library. This library can be renamed, but not deleted. The upload library is the only library that can be synced with a mobile device. No items in an upload library is allowed to have the same sha1 hash as another item in the same library in order to prevent duplicates.
-
 ## External Libraries
 
 External libraries tracks assets stored outside of Immich, i.e. in the file system. When the external library is scanned, Immich will read the metadata from the file and create an asset in the library for each image or video file. These items will then be shown in the main timeline, and they will look and behave like any other asset, including viewing on the map, adding to albums, etc.
diff --git a/e2e/src/api/specs/asset.e2e-spec.ts b/e2e/src/api/specs/asset.e2e-spec.ts
index 050fa9b1e..50b84fd9b 100644
--- a/e2e/src/api/specs/asset.e2e-spec.ts
+++ b/e2e/src/api/specs/asset.e2e-spec.ts
@@ -2,10 +2,8 @@ import {
   AssetFileUploadResponseDto,
   AssetResponseDto,
   AssetTypeEnum,
-  LibraryResponseDto,
   LoginResponseDto,
   SharedLinkType,
-  getAllLibraries,
   getAssetInfo,
   updateAssets,
 } from '@immich/sdk';
@@ -819,25 +817,6 @@ describe('/asset', () => {
       expect(duplicate).toBe(true);
     });
 
-    it("should not upload to another user's library", async () => {
-      const libraries = await getAllLibraries({}, { headers: asBearerAuth(admin.accessToken) });
-      const library = libraries.find((library) => library.ownerId === user1.userId) as LibraryResponseDto;
-
-      const { body, status } = await request(app)
-        .post('/asset/upload')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .field('libraryId', library.id)
-        .field('deviceAssetId', 'example-image')
-        .field('deviceId', 'e2e')
-        .field('fileCreatedAt', new Date().toISOString())
-        .field('fileModifiedAt', new Date().toISOString())
-        .field('duration', '0:00:00.000000')
-        .attach('assetData', makeRandomImage(), 'example.png');
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no asset.upload access'));
-    });
-
     it('should update the used quota', async () => {
       const { body, status } = await request(app)
         .post('/asset/upload')
diff --git a/e2e/src/api/specs/library.e2e-spec.ts b/e2e/src/api/specs/library.e2e-spec.ts
index 18becec77..f31a20e27 100644
--- a/e2e/src/api/specs/library.e2e-spec.ts
+++ b/e2e/src/api/specs/library.e2e-spec.ts
@@ -1,11 +1,4 @@
-import {
-  LibraryResponseDto,
-  LibraryType,
-  LoginResponseDto,
-  ScanLibraryDto,
-  getAllLibraries,
-  scanLibrary,
-} from '@immich/sdk';
+import { LibraryResponseDto, LoginResponseDto, ScanLibraryDto, getAllLibraries, scanLibrary } from '@immich/sdk';
 import { cpSync, existsSync } from 'node:fs';
 import { Socket } from 'socket.io-client';
 import { userDto, uuidDto } from 'src/fixtures';
@@ -29,7 +22,7 @@ describe('/library', () => {
     admin = await utils.adminSetup();
     await utils.resetAdminConfig(admin.accessToken);
     user = await utils.userSetup(admin.accessToken, userDto.user1);
-    library = await utils.createLibrary(admin.accessToken, { ownerId: admin.userId, type: LibraryType.External });
+    library = await utils.createLibrary(admin.accessToken, { ownerId: admin.userId });
     websocket = await utils.connectWebsocket(admin.accessToken);
     utils.createImageFile(`${testAssetDir}/temp/directoryA/assetA.png`);
     utils.createImageFile(`${testAssetDir}/temp/directoryB/assetB.png`);
@@ -50,24 +43,6 @@ describe('/library', () => {
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
-
-    it('should start with a default upload library', async () => {
-      const { status, body } = await request(app).get('/library').set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            ownerId: admin.userId,
-            type: LibraryType.Upload,
-            name: 'Default Library',
-            refreshedAt: null,
-            assetCount: 0,
-            importPaths: [],
-            exclusionPatterns: [],
-          }),
-        ]),
-      );
-    });
   });
 
   describe('POST /library', () => {
@@ -81,7 +56,7 @@ describe('/library', () => {
       const { status, body } = await request(app)
         .post('/library')
         .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({ ownerId: admin.userId, type: LibraryType.External });
+        .send({ ownerId: admin.userId });
 
       expect(status).toBe(403);
       expect(body).toEqual(errorDto.forbidden);
@@ -91,13 +66,12 @@ describe('/library', () => {
       const { status, body } = await request(app)
         .post('/library')
         .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ownerId: admin.userId, type: LibraryType.External });
+        .send({ ownerId: admin.userId });
 
       expect(status).toBe(201);
       expect(body).toEqual(
         expect.objectContaining({
           ownerId: admin.userId,
-          type: LibraryType.External,
           name: 'New External Library',
           refreshedAt: null,
           assetCount: 0,
@@ -113,7 +87,6 @@ describe('/library', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           ownerId: admin.userId,
-          type: LibraryType.External,
           name: 'My Awesome Library',
           importPaths: ['/path/to/import'],
           exclusionPatterns: ['**/Raw/**'],
@@ -134,7 +107,6 @@ describe('/library', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           ownerId: admin.userId,
-          type: LibraryType.External,
           name: 'My Awesome Library',
           importPaths: ['/path', '/path'],
           exclusionPatterns: ['**/Raw/**'],
@@ -150,7 +122,6 @@ describe('/library', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`)
         .send({
           ownerId: admin.userId,
-          type: LibraryType.External,
           name: 'My Awesome Library',
           importPaths: ['/path/to/import'],
           exclusionPatterns: ['**/Raw/**', '**/Raw/**'],
@@ -159,60 +130,6 @@ describe('/library', () => {
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.badRequest(["All exclusionPatterns's elements must be unique"]));
     });
-
-    it('should create an upload library with defaults', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ownerId: admin.userId, type: LibraryType.Upload });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          ownerId: admin.userId,
-          type: LibraryType.Upload,
-          name: 'New Upload Library',
-          refreshedAt: null,
-          assetCount: 0,
-          importPaths: [],
-          exclusionPatterns: [],
-        }),
-      );
-    });
-
-    it('should create an upload library with options', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ownerId: admin.userId, type: LibraryType.Upload, name: 'My Awesome Library' });
-
-      expect(status).toBe(201);
-      expect(body).toEqual(
-        expect.objectContaining({
-          name: 'My Awesome Library',
-        }),
-      );
-    });
-
-    it('should not allow upload libraries to have import paths', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ownerId: admin.userId, type: LibraryType.Upload, importPaths: ['/path/to/import'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Upload libraries cannot have import paths'));
-    });
-
-    it('should not allow upload libraries to have exclusion patterns', async () => {
-      const { status, body } = await request(app)
-        .post('/library')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ownerId: admin.userId, type: LibraryType.Upload, exclusionPatterns: ['**/Raw/**'] });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Upload libraries cannot have exclusion patterns'));
-    });
   });
 
   describe('PUT /library/:id', () => {
@@ -332,10 +249,7 @@ describe('/library', () => {
     });
 
     it('should get library by id', async () => {
-      const library = await utils.createLibrary(admin.accessToken, {
-        ownerId: admin.userId,
-        type: LibraryType.External,
-      });
+      const library = await utils.createLibrary(admin.accessToken, { ownerId: admin.userId });
 
       const { status, body } = await request(app)
         .get(`/library/${library.id}`)
@@ -345,7 +259,6 @@ describe('/library', () => {
       expect(body).toEqual(
         expect.objectContaining({
           ownerId: admin.userId,
-          type: LibraryType.External,
           name: 'New External Library',
           refreshedAt: null,
           assetCount: 0,
@@ -373,24 +286,9 @@ describe('/library', () => {
       expect(body).toEqual(errorDto.unauthorized);
     });
 
-    it('should not scan an upload library', async () => {
-      const library = await utils.createLibrary(admin.accessToken, {
-        ownerId: admin.userId,
-        type: LibraryType.Upload,
-      });
-
-      const { status, body } = await request(app)
-        .post(`/library/${library.id}/scan`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Can only refresh external libraries'));
-    });
-
     it('should scan external library', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp/directoryA`],
       });
 
@@ -406,7 +304,6 @@ describe('/library', () => {
     it('should scan external library with exclusion pattern', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp`],
         exclusionPatterns: ['**/directoryA'],
       });
@@ -423,7 +320,6 @@ describe('/library', () => {
     it('should scan multiple import paths', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp/directoryA`, `${testAssetDirInternal}/temp/directoryB`],
       });
 
@@ -440,7 +336,6 @@ describe('/library', () => {
     it('should pick up new files', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
@@ -466,7 +361,6 @@ describe('/library', () => {
       utils.createImageFile(`${testAssetDir}/temp/directoryA/assetB.png`);
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
@@ -493,7 +387,6 @@ describe('/library', () => {
     it('should scan new files', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
@@ -521,7 +414,6 @@ describe('/library', () => {
       it('should reimport modified files', async () => {
         const library = await utils.createLibrary(admin.accessToken, {
           ownerId: admin.userId,
-          type: LibraryType.External,
           importPaths: [`${testAssetDirInternal}/temp`],
         });
 
@@ -549,7 +441,6 @@ describe('/library', () => {
       it('should not reimport unmodified files', async () => {
         const library = await utils.createLibrary(admin.accessToken, {
           ownerId: admin.userId,
-          type: LibraryType.External,
           importPaths: [`${testAssetDirInternal}/temp`],
         });
 
@@ -579,7 +470,6 @@ describe('/library', () => {
       it('should reimport all files', async () => {
         const library = await utils.createLibrary(admin.accessToken, {
           ownerId: admin.userId,
-          type: LibraryType.External,
           importPaths: [`${testAssetDirInternal}/temp`],
         });
 
@@ -617,7 +507,6 @@ describe('/library', () => {
     it('should remove offline files', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
@@ -658,7 +547,6 @@ describe('/library', () => {
     it('should not remove online files', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
@@ -737,37 +625,8 @@ describe('/library', () => {
       expect(body).toEqual(errorDto.unauthorized);
     });
 
-    it('should not delete the last upload library', async () => {
-      const libraries = await getAllLibraries(
-        { $type: LibraryType.Upload },
-        { headers: asBearerAuth(admin.accessToken) },
-      );
-
-      const adminLibraries = libraries.filter((library) => library.ownerId === admin.userId);
-      expect(adminLibraries.length).toBeGreaterThanOrEqual(1);
-      const lastLibrary = adminLibraries.pop() as LibraryResponseDto;
-
-      // delete all but the last upload library
-      for (const library of adminLibraries) {
-        const { status } = await request(app)
-          .delete(`/library/${library.id}`)
-          .set('Authorization', `Bearer ${admin.accessToken}`);
-        expect(status).toBe(204);
-      }
-
-      const { status, body } = await request(app)
-        .delete(`/library/${lastLibrary.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(body).toEqual(errorDto.noDeleteUploadLibrary);
-      expect(status).toBe(400);
-    });
-
     it('should delete an external library', async () => {
-      const library = await utils.createLibrary(admin.accessToken, {
-        ownerId: admin.userId,
-        type: LibraryType.External,
-      });
+      const library = await utils.createLibrary(admin.accessToken, { ownerId: admin.userId });
 
       const { status, body } = await request(app)
         .delete(`/library/${library.id}`)
@@ -776,7 +635,7 @@ describe('/library', () => {
       expect(status).toBe(204);
       expect(body).toEqual({});
 
-      const libraries = await getAllLibraries({}, { headers: asBearerAuth(admin.accessToken) });
+      const libraries = await getAllLibraries({ headers: asBearerAuth(admin.accessToken) });
       expect(libraries).not.toEqual(
         expect.arrayContaining([
           expect.objectContaining({
@@ -789,7 +648,6 @@ describe('/library', () => {
     it('should delete an external library with assets', async () => {
       const library = await utils.createLibrary(admin.accessToken, {
         ownerId: admin.userId,
-        type: LibraryType.External,
         importPaths: [`${testAssetDirInternal}/temp`],
       });
 
@@ -803,7 +661,7 @@ describe('/library', () => {
       expect(status).toBe(204);
       expect(body).toEqual({});
 
-      const libraries = await getAllLibraries({}, { headers: asBearerAuth(admin.accessToken) });
+      const libraries = await getAllLibraries({ headers: asBearerAuth(admin.accessToken) });
       expect(libraries).not.toEqual(
         expect.arrayContaining([
           expect.objectContaining({
diff --git a/e2e/src/responses.ts b/e2e/src/responses.ts
index 37892be0c..afe3334a7 100644
--- a/e2e/src/responses.ts
+++ b/e2e/src/responses.ts
@@ -51,11 +51,6 @@ export const errorDto = {
     statusCode: 400,
     message: 'The server already has an admin',
   },
-  noDeleteUploadLibrary: {
-    error: 'Bad Request',
-    statusCode: 400,
-    message: 'Cannot delete the last upload library',
-  },
 };
 
 export const signupResponseDto = {
diff --git a/mobile/openapi/.openapi-generator/FILES b/mobile/openapi/.openapi-generator/FILES
index 69172bd97..74f3ac621 100644
--- a/mobile/openapi/.openapi-generator/FILES
+++ b/mobile/openapi/.openapi-generator/FILES
@@ -92,7 +92,6 @@ doc/JobStatusDto.md
 doc/LibraryApi.md
 doc/LibraryResponseDto.md
 doc/LibraryStatsResponseDto.md
-doc/LibraryType.md
 doc/LogLevel.md
 doc/LoginCredentialDto.md
 doc/LoginResponseDto.md
@@ -331,7 +330,6 @@ lib/model/job_settings_dto.dart
 lib/model/job_status_dto.dart
 lib/model/library_response_dto.dart
 lib/model/library_stats_response_dto.dart
-lib/model/library_type.dart
 lib/model/log_level.dart
 lib/model/login_credential_dto.dart
 lib/model/login_response_dto.dart
@@ -531,7 +529,6 @@ test/job_status_dto_test.dart
 test/library_api_test.dart
 test/library_response_dto_test.dart
 test/library_stats_response_dto_test.dart
-test/library_type_test.dart
 test/log_level_test.dart
 test/login_credential_dto_test.dart
 test/login_response_dto_test.dart
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 048d5b00a..090182fc3 100644
Binary files a/mobile/openapi/README.md and b/mobile/openapi/README.md differ
diff --git a/mobile/openapi/doc/AssetApi.md b/mobile/openapi/doc/AssetApi.md
index a1491c79a..1ea86f26f 100644
Binary files a/mobile/openapi/doc/AssetApi.md and b/mobile/openapi/doc/AssetApi.md differ
diff --git a/mobile/openapi/doc/AssetResponseDto.md b/mobile/openapi/doc/AssetResponseDto.md
index 41a628bd5..3ff4db340 100644
Binary files a/mobile/openapi/doc/AssetResponseDto.md and b/mobile/openapi/doc/AssetResponseDto.md differ
diff --git a/mobile/openapi/doc/CreateLibraryDto.md b/mobile/openapi/doc/CreateLibraryDto.md
index f7d5c0ecf..662c9b0d4 100644
Binary files a/mobile/openapi/doc/CreateLibraryDto.md and b/mobile/openapi/doc/CreateLibraryDto.md differ
diff --git a/mobile/openapi/doc/LibraryApi.md b/mobile/openapi/doc/LibraryApi.md
index 8a204788b..ca67ab530 100644
Binary files a/mobile/openapi/doc/LibraryApi.md and b/mobile/openapi/doc/LibraryApi.md differ
diff --git a/mobile/openapi/doc/LibraryResponseDto.md b/mobile/openapi/doc/LibraryResponseDto.md
index e7283c11b..6e9af87db 100644
Binary files a/mobile/openapi/doc/LibraryResponseDto.md and b/mobile/openapi/doc/LibraryResponseDto.md differ
diff --git a/mobile/openapi/doc/LibraryType.md b/mobile/openapi/doc/LibraryType.md
deleted file mode 100644
index 0bd5a3a14..000000000
Binary files a/mobile/openapi/doc/LibraryType.md and /dev/null differ
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 110c4f757..8cd0f4365 100644
Binary files a/mobile/openapi/lib/api.dart and b/mobile/openapi/lib/api.dart differ
diff --git a/mobile/openapi/lib/api/asset_api.dart b/mobile/openapi/lib/api/asset_api.dart
index dba33fc18..f3c8389ab 100644
Binary files a/mobile/openapi/lib/api/asset_api.dart and b/mobile/openapi/lib/api/asset_api.dart differ
diff --git a/mobile/openapi/lib/api/library_api.dart b/mobile/openapi/lib/api/library_api.dart
index 7a980535f..48f46e6e1 100644
Binary files a/mobile/openapi/lib/api/library_api.dart and b/mobile/openapi/lib/api/library_api.dart differ
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 6256d0c48..2bebf46b1 100644
Binary files a/mobile/openapi/lib/api_client.dart and b/mobile/openapi/lib/api_client.dart differ
diff --git a/mobile/openapi/lib/api_helper.dart b/mobile/openapi/lib/api_helper.dart
index a43ed6ecb..f945dbb11 100644
Binary files a/mobile/openapi/lib/api_helper.dart and b/mobile/openapi/lib/api_helper.dart differ
diff --git a/mobile/openapi/lib/model/asset_response_dto.dart b/mobile/openapi/lib/model/asset_response_dto.dart
index 8802bb03a..b9c31e29c 100644
Binary files a/mobile/openapi/lib/model/asset_response_dto.dart and b/mobile/openapi/lib/model/asset_response_dto.dart differ
diff --git a/mobile/openapi/lib/model/create_library_dto.dart b/mobile/openapi/lib/model/create_library_dto.dart
index 7d1ce0eea..65ceec8e8 100644
Binary files a/mobile/openapi/lib/model/create_library_dto.dart and b/mobile/openapi/lib/model/create_library_dto.dart differ
diff --git a/mobile/openapi/lib/model/library_response_dto.dart b/mobile/openapi/lib/model/library_response_dto.dart
index c2a25913c..e27b48910 100644
Binary files a/mobile/openapi/lib/model/library_response_dto.dart and b/mobile/openapi/lib/model/library_response_dto.dart differ
diff --git a/mobile/openapi/lib/model/library_type.dart b/mobile/openapi/lib/model/library_type.dart
deleted file mode 100644
index 0e5f56b51..000000000
Binary files a/mobile/openapi/lib/model/library_type.dart and /dev/null differ
diff --git a/mobile/openapi/test/asset_api_test.dart b/mobile/openapi/test/asset_api_test.dart
index de84e5354..a1ecd2cc3 100644
Binary files a/mobile/openapi/test/asset_api_test.dart and b/mobile/openapi/test/asset_api_test.dart differ
diff --git a/mobile/openapi/test/asset_response_dto_test.dart b/mobile/openapi/test/asset_response_dto_test.dart
index e666a3bb7..533ec8805 100644
Binary files a/mobile/openapi/test/asset_response_dto_test.dart and b/mobile/openapi/test/asset_response_dto_test.dart differ
diff --git a/mobile/openapi/test/create_library_dto_test.dart b/mobile/openapi/test/create_library_dto_test.dart
index a85578d6a..c094e44da 100644
Binary files a/mobile/openapi/test/create_library_dto_test.dart and b/mobile/openapi/test/create_library_dto_test.dart differ
diff --git a/mobile/openapi/test/library_api_test.dart b/mobile/openapi/test/library_api_test.dart
index d34286f99..f23d11897 100644
Binary files a/mobile/openapi/test/library_api_test.dart and b/mobile/openapi/test/library_api_test.dart differ
diff --git a/mobile/openapi/test/library_response_dto_test.dart b/mobile/openapi/test/library_response_dto_test.dart
index d07c464d9..51528bb67 100644
Binary files a/mobile/openapi/test/library_response_dto_test.dart and b/mobile/openapi/test/library_response_dto_test.dart differ
diff --git a/mobile/openapi/test/library_type_test.dart b/mobile/openapi/test/library_type_test.dart
deleted file mode 100644
index 3101173c5..000000000
Binary files a/mobile/openapi/test/library_type_test.dart and /dev/null differ
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 8fc5378ed..f2d30f153 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -2439,16 +2439,7 @@
     "/library": {
       "get": {
         "operationId": "getAllLibraries",
-        "parameters": [
-          {
-            "name": "type",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "$ref": "#/components/schemas/LibraryType"
-            }
-          }
-        ],
+        "parameters": [],
         "responses": {
           "200": {
             "content": {
@@ -7365,6 +7356,9 @@
             "type": "boolean"
           },
           "libraryId": {
+            "deprecated": true,
+            "description": "This property was deprecated in v1.106.0",
+            "nullable": true,
             "type": "string"
           },
           "livePhotoVideoId": {
@@ -7444,7 +7438,6 @@
           "isFavorite",
           "isOffline",
           "isTrashed",
-          "libraryId",
           "localDateTime",
           "originalFileName",
           "originalPath",
@@ -7715,10 +7708,6 @@
           "isVisible": {
             "type": "boolean"
           },
-          "libraryId": {
-            "format": "uuid",
-            "type": "string"
-          },
           "livePhotoData": {
             "format": "binary",
             "type": "string"
@@ -7757,14 +7746,10 @@
           "ownerId": {
             "format": "uuid",
             "type": "string"
-          },
-          "type": {
-            "$ref": "#/components/schemas/LibraryType"
           }
         },
         "required": [
-          "ownerId",
-          "type"
+          "ownerId"
         ],
         "type": "object"
       },
@@ -8319,9 +8304,6 @@
             "nullable": true,
             "type": "string"
           },
-          "type": {
-            "$ref": "#/components/schemas/LibraryType"
-          },
           "updatedAt": {
             "format": "date-time",
             "type": "string"
@@ -8336,7 +8318,6 @@
           "name",
           "ownerId",
           "refreshedAt",
-          "type",
           "updatedAt"
         ],
         "type": "object"
@@ -8369,13 +8350,6 @@
         ],
         "type": "object"
       },
-      "LibraryType": {
-        "enum": [
-          "UPLOAD",
-          "EXTERNAL"
-        ],
-        "type": "string"
-      },
       "LogLevel": {
         "enum": [
           "verbose",
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index f0af90a8d..d3ab222d7 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -130,7 +130,8 @@ export type AssetResponseDto = {
     /** This property was deprecated in v1.104.0 */
     isReadOnly?: boolean;
     isTrashed: boolean;
-    libraryId: string;
+    /** This property was deprecated in v1.106.0 */
+    libraryId?: string | null;
     livePhotoVideoId?: string | null;
     localDateTime: string;
     originalFileName: string;
@@ -307,7 +308,6 @@ export type CreateAssetDto = {
     isFavorite?: boolean;
     isOffline?: boolean;
     isVisible?: boolean;
-    libraryId?: string;
     livePhotoData?: Blob;
     sidecarData?: Blob;
 };
@@ -442,7 +442,6 @@ export type LibraryResponseDto = {
     name: string;
     ownerId: string;
     refreshedAt: string | null;
-    "type": LibraryType;
     updatedAt: string;
 };
 export type CreateLibraryDto = {
@@ -450,7 +449,6 @@ export type CreateLibraryDto = {
     importPaths?: string[];
     name?: string;
     ownerId: string;
-    "type": LibraryType;
 };
 export type UpdateLibraryDto = {
     exclusionPatterns?: string[];
@@ -1754,15 +1752,11 @@ export function sendJobCommand({ id, jobCommandDto }: {
         body: jobCommandDto
     })));
 }
-export function getAllLibraries({ $type }: {
-    $type?: LibraryType;
-}, opts?: Oazapfts.RequestOpts) {
+export function getAllLibraries(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
         data: LibraryResponseDto[];
-    }>(`/library${QS.query(QS.explode({
-        "type": $type
-    }))}`, {
+    }>("/library", {
         ...opts
     }));
 }
@@ -2913,10 +2907,6 @@ export enum JobCommand {
     Empty = "empty",
     ClearFailed = "clear-failed"
 }
-export enum LibraryType {
-    Upload = "UPLOAD",
-    External = "EXTERNAL"
-}
 export enum Type2 {
     OnThisDay = "on_this_day"
 }
diff --git a/server/src/controllers/library.controller.ts b/server/src/controllers/library.controller.ts
index 74a4f73d2..adbae8af0 100644
--- a/server/src/controllers/library.controller.ts
+++ b/server/src/controllers/library.controller.ts
@@ -1,11 +1,10 @@
-import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import {
   CreateLibraryDto,
   LibraryResponseDto,
   LibraryStatsResponseDto,
   ScanLibraryDto,
-  SearchLibraryDto,
   UpdateLibraryDto,
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
@@ -21,8 +20,8 @@ export class LibraryController {
 
   @Get()
   @Authenticated({ admin: true })
-  getAllLibraries(@Query() dto: SearchLibraryDto): Promise<LibraryResponseDto[]> {
-    return this.service.getAll(dto);
+  getAllLibraries(): Promise<LibraryResponseDto[]> {
+    return this.service.getAll();
   }
 
   @Post()
diff --git a/server/src/cores/access.core.ts b/server/src/cores/access.core.ts
index 6f8930d05..ae666562c 100644
--- a/server/src/cores/access.core.ts
+++ b/server/src/cores/access.core.ts
@@ -274,7 +274,7 @@ export class AccessCore {
       }
 
       case Permission.ASSET_UPLOAD: {
-        return await this.repository.library.checkOwnerAccess(auth.user.id, ids);
+        return ids.has(auth.user.id) ? new Set([auth.user.id]) : new Set<string>();
       }
 
       case Permission.ARCHIVE_READ: {
diff --git a/server/src/cores/user.core.ts b/server/src/cores/user.core.ts
index db2a9c780..4628c8383 100644
--- a/server/src/cores/user.core.ts
+++ b/server/src/cores/user.core.ts
@@ -2,7 +2,6 @@ import { BadRequestException, ForbiddenException } from '@nestjs/common';
 import sanitize from 'sanitize-filename';
 import { SALT_ROUNDS } from 'src/constants';
 import { UserResponseDto } from 'src/dtos/user.dto';
-import { LibraryType } from 'src/entities/library.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { ILibraryRepository } from 'src/interfaces/library.interface';
@@ -93,16 +92,7 @@ export class UserCore {
     if (payload.storageLabel) {
       payload.storageLabel = sanitize(payload.storageLabel.replaceAll('.', ''));
     }
-    const userEntity = await this.userRepository.create(payload);
-    await this.libraryRepository.create({
-      owner: { id: userEntity.id } as UserEntity,
-      name: 'Default Library',
-      assets: [],
-      type: LibraryType.UPLOAD,
-      importPaths: [],
-      exclusionPatterns: [],
-    });
 
-    return userEntity;
+    return this.userRepository.create(payload);
   }
 }
diff --git a/server/src/dtos/asset-response.dto.ts b/server/src/dtos/asset-response.dto.ts
index 879d358e8..2cf12061d 100644
--- a/server/src/dtos/asset-response.dto.ts
+++ b/server/src/dtos/asset-response.dto.ts
@@ -26,7 +26,8 @@ export class AssetResponseDto extends SanitizedAssetResponseDto {
   deviceId!: string;
   ownerId!: string;
   owner?: UserResponseDto;
-  libraryId!: string;
+  @PropertyLifecycle({ deprecatedAt: 'v1.106.0' })
+  libraryId?: string | null;
   originalPath!: string;
   originalFileName!: string;
   fileCreatedAt!: Date;
diff --git a/server/src/dtos/asset-v1.dto.ts b/server/src/dtos/asset-v1.dto.ts
index 131d28ca4..83c34ab0f 100644
--- a/server/src/dtos/asset-v1.dto.ts
+++ b/server/src/dtos/asset-v1.dto.ts
@@ -2,7 +2,7 @@ import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 import { ArrayNotEmpty, IsArray, IsEnum, IsInt, IsNotEmpty, IsString, IsUUID, ValidateNested } from 'class-validator';
 import { UploadFieldName } from 'src/dtos/asset.dto';
-import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate } from 'src/validation';
 
 export class AssetBulkUploadCheckItem {
   @IsString()
@@ -64,9 +64,6 @@ export class CheckExistingAssetsDto {
 }
 
 export class CreateAssetDto {
-  @ValidateUUID({ optional: true })
-  libraryId?: string;
-
   @IsNotEmpty()
   @IsString()
   deviceAssetId!: string;
diff --git a/server/src/dtos/library.dto.ts b/server/src/dtos/library.dto.ts
index 045aaecf5..b9578a2c3 100644
--- a/server/src/dtos/library.dto.ts
+++ b/server/src/dtos/library.dto.ts
@@ -1,13 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { ArrayMaxSize, ArrayUnique, IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
+import { ArrayMaxSize, ArrayUnique, IsNotEmpty, IsString } from 'class-validator';
+import { LibraryEntity } from 'src/entities/library.entity';
 import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
 
 export class CreateLibraryDto {
-  @IsEnum(LibraryType)
-  @ApiProperty({ enumName: 'LibraryType', enum: LibraryType })
-  type!: LibraryType;
-
   @ValidateUUID()
   ownerId!: string;
 
@@ -97,21 +93,11 @@ export class ScanLibraryDto {
   refreshAllFiles?: boolean;
 }
 
-export class SearchLibraryDto {
-  @IsEnum(LibraryType)
-  @ApiProperty({ enumName: 'LibraryType', enum: LibraryType })
-  @Optional()
-  type?: LibraryType;
-}
-
 export class LibraryResponseDto {
   id!: string;
   ownerId!: string;
   name!: string;
 
-  @ApiProperty({ enumName: 'LibraryType', enum: LibraryType })
-  type!: LibraryType;
-
   @ApiProperty({ type: 'integer' })
   assetCount!: number;
 
@@ -146,7 +132,6 @@ export function mapLibrary(entity: LibraryEntity): LibraryResponseDto {
   return {
     id: entity.id,
     ownerId: entity.ownerId,
-    type: entity.type,
     name: entity.name,
     createdAt: entity.createdAt,
     updatedAt: entity.updatedAt,
diff --git a/server/src/entities/asset.entity.ts b/server/src/entities/asset.entity.ts
index 7169ee907..2189d5389 100644
--- a/server/src/entities/asset.entity.ts
+++ b/server/src/entities/asset.entity.ts
@@ -25,12 +25,17 @@ import {
   UpdateDateColumn,
 } from 'typeorm';
 
-export const ASSET_CHECKSUM_CONSTRAINT = 'UQ_assets_owner_library_checksum';
+export const ASSET_CHECKSUM_CONSTRAINT = 'UQ_assets_owner_checksum';
 
 @Entity('assets')
 // Checksums must be unique per user and library
-@Index(ASSET_CHECKSUM_CONSTRAINT, ['owner', 'library', 'checksum'], {
+@Index(ASSET_CHECKSUM_CONSTRAINT, ['owner', 'checksum'], {
   unique: true,
+  where: '"libraryId" IS NULL',
+})
+@Index('UQ_assets_owner_library_checksum' + '', ['owner', 'library', 'checksum'], {
+  unique: true,
+  where: '"libraryId" IS NOT NULL',
 })
 @Index('IDX_day_of_month', { synchronize: false })
 @Index('IDX_month', { synchronize: false })
@@ -51,11 +56,11 @@ export class AssetEntity {
   @Column()
   ownerId!: string;
 
-  @ManyToOne(() => LibraryEntity, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
-  library!: LibraryEntity;
+  @ManyToOne(() => LibraryEntity, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
+  library?: LibraryEntity | null;
 
-  @Column()
-  libraryId!: string;
+  @Column({ nullable: true })
+  libraryId?: string | null;
 
   @Column()
   deviceId!: string;
diff --git a/server/src/entities/library.entity.ts b/server/src/entities/library.entity.ts
index 56e62dd06..a6053e421 100644
--- a/server/src/entities/library.entity.ts
+++ b/server/src/entities/library.entity.ts
@@ -30,9 +30,6 @@ export class LibraryEntity {
   @Column()
   ownerId!: string;
 
-  @Column()
-  type!: LibraryType;
-
   @Column('text', { array: true })
   importPaths!: string[];
 
@@ -51,8 +48,3 @@ export class LibraryEntity {
   @Column({ type: 'timestamptz', nullable: true })
   refreshedAt!: Date | null;
 }
-
-export enum LibraryType {
-  UPLOAD = 'UPLOAD',
-  EXTERNAL = 'EXTERNAL',
-}
diff --git a/server/src/interfaces/access.interface.ts b/server/src/interfaces/access.interface.ts
index e07b877b6..6b408c263 100644
--- a/server/src/interfaces/access.interface.ts
+++ b/server/src/interfaces/access.interface.ts
@@ -26,10 +26,6 @@ export interface IAccessRepository {
     checkSharedLinkAccess(sharedLinkId: string, albumIds: Set<string>): Promise<Set<string>>;
   };
 
-  library: {
-    checkOwnerAccess(userId: string, libraryIds: Set<string>): Promise<Set<string>>;
-  };
-
   timeline: {
     checkPartnerAccess(userId: string, partnerIds: Set<string>): Promise<Set<string>>;
   };
diff --git a/server/src/interfaces/asset.interface.ts b/server/src/interfaces/asset.interface.ts
index 4b9ff031e..0a8437818 100644
--- a/server/src/interfaces/asset.interface.ts
+++ b/server/src/interfaces/asset.interface.ts
@@ -164,7 +164,7 @@ export interface IAssetRepository {
   ): Promise<AssetEntity[]>;
   getByIdsWithAllRelations(ids: string[]): Promise<AssetEntity[]>;
   getByDayOfYear(ownerIds: string[], monthDay: MonthDay): Promise<AssetEntity[]>;
-  getByChecksum(libraryId: string, checksum: Buffer): Promise<AssetEntity | null>;
+  getByChecksum(libraryId: string | null, checksum: Buffer): Promise<AssetEntity | null>;
   getUploadAssetIdByChecksum(ownerId: string, checksum: Buffer): Promise<string | undefined>;
   getByAlbumId(pagination: PaginationOptions, albumId: string): Paginated<AssetEntity>;
   getByUserId(pagination: PaginationOptions, userId: string, options?: AssetSearchOptions): Paginated<AssetEntity>;
diff --git a/server/src/interfaces/library.interface.ts b/server/src/interfaces/library.interface.ts
index dbc7fab81..30b8b39a0 100644
--- a/server/src/interfaces/library.interface.ts
+++ b/server/src/interfaces/library.interface.ts
@@ -1,18 +1,16 @@
 import { LibraryStatsResponseDto } from 'src/dtos/library.dto';
-import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
+import { LibraryEntity } from 'src/entities/library.entity';
 
 export const ILibraryRepository = 'ILibraryRepository';
 
 export interface ILibraryRepository {
   getCountForUser(ownerId: string): Promise<number>;
-  getAll(withDeleted?: boolean, type?: LibraryType): Promise<LibraryEntity[]>;
+  getAll(withDeleted?: boolean): Promise<LibraryEntity[]>;
   getAllDeleted(): Promise<LibraryEntity[]>;
   get(id: string, withDeleted?: boolean): Promise<LibraryEntity | null>;
   create(library: Partial<LibraryEntity>): Promise<LibraryEntity>;
   delete(id: string): Promise<void>;
   softDelete(id: string): Promise<void>;
-  getDefaultUploadLibrary(ownerId: string): Promise<LibraryEntity | null>;
-  getUploadLibraryCount(ownerId: string): Promise<number>;
   update(library: Partial<LibraryEntity>): Promise<LibraryEntity>;
   getStatistics(id: string): Promise<LibraryStatsResponseDto>;
   getAssetIds(id: string, withDeleted?: boolean): Promise<string[]>;
diff --git a/server/src/migrations/1715804005643-RemoveLibraryType.ts b/server/src/migrations/1715804005643-RemoveLibraryType.ts
new file mode 100644
index 000000000..d42ba4ec7
--- /dev/null
+++ b/server/src/migrations/1715804005643-RemoveLibraryType.ts
@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveLibraryType1715804005643 implements MigrationInterface {
+  name = 'RemoveLibraryType1715804005643';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "assets" DROP CONSTRAINT "FK_9977c3c1de01c3d848039a6b90c"`);
+    await queryRunner.query(`DROP INDEX "public"."UQ_assets_owner_library_checksum"`);
+    await queryRunner.query(`DROP INDEX "public"."IDX_originalPath_libraryId"`);
+    await queryRunner.query(`ALTER TABLE "assets" ALTER COLUMN "libraryId" DROP NOT NULL`);
+    await queryRunner.query(`
+      UPDATE "assets"
+      SET "libraryId" = NULL
+      FROM "libraries"
+      WHERE "assets"."libraryId" = "libraries"."id"
+      AND "libraries"."type" = 'UPLOAD'
+`);
+    await queryRunner.query(`DELETE FROM "libraries" WHERE "type" = 'UPLOAD'`);
+    await queryRunner.query(`ALTER TABLE "libraries" DROP COLUMN "type"`);
+    await queryRunner.query(`CREATE INDEX "IDX_originalPath_libraryId" ON "assets" ("originalPath", "libraryId")`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "UQ_assets_owner_checksum" ON "assets" ("ownerId", "checksum") WHERE "libraryId" IS NULL`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "UQ_assets_owner_library_checksum" ON "assets" ("ownerId", "libraryId", "checksum") WHERE "libraryId" IS NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "assets" ADD CONSTRAINT "FK_9977c3c1de01c3d848039a6b90c" FOREIGN KEY ("libraryId") REFERENCES "libraries"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+  }
+
+  public async down(): Promise<void> {
+    // not implemented
+  }
+}
diff --git a/server/src/queries/access.repository.sql b/server/src/queries/access.repository.sql
index 52cf28c77..b08638707 100644
--- a/server/src/queries/access.repository.sql
+++ b/server/src/queries/access.repository.sql
@@ -191,20 +191,6 @@ WHERE
     AND ("SessionEntity"."id" IN ($2))
   )
 
--- AccessRepository.library.checkOwnerAccess
-SELECT
-  "LibraryEntity"."id" AS "LibraryEntity_id"
-FROM
-  "libraries" "LibraryEntity"
-WHERE
-  (
-    (
-      ("LibraryEntity"."id" IN ($1))
-      AND ("LibraryEntity"."ownerId" = $2)
-    )
-  )
-  AND ("LibraryEntity"."deletedAt" IS NULL)
-
 -- AccessRepository.memory.checkOwnerAccess
 SELECT
   "MemoryEntity"."id" AS "MemoryEntity_id"
diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql
index 3c6c83ff1..6829c1445 100644
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -483,26 +483,16 @@ LIMIT
   1
 
 -- AssetRepository.getUploadAssetIdByChecksum
-SELECT DISTINCT
-  "distinctAlias"."AssetEntity_id" AS "ids_AssetEntity_id"
+SELECT
+  "AssetEntity"."id" AS "AssetEntity_id"
 FROM
+  "assets" "AssetEntity"
+WHERE
   (
-    SELECT
-      "AssetEntity"."id" AS "AssetEntity_id"
-    FROM
-      "assets" "AssetEntity"
-      LEFT JOIN "libraries" "AssetEntity__AssetEntity_library" ON "AssetEntity__AssetEntity_library"."id" = "AssetEntity"."libraryId"
-    WHERE
-      (
-        ("AssetEntity"."ownerId" = $1)
-        AND ("AssetEntity"."checksum" = $2)
-        AND (
-          (("AssetEntity__AssetEntity_library"."type" = $3))
-        )
-      )
-  ) "distinctAlias"
-ORDER BY
-  "AssetEntity_id" ASC
+    ("AssetEntity"."ownerId" = $1)
+    AND ("AssetEntity"."checksum" = $2)
+    AND ("AssetEntity"."libraryId" IS NULL)
+  )
 LIMIT
   1
 
diff --git a/server/src/queries/library.repository.sql b/server/src/queries/library.repository.sql
index 3e655d650..700a71048 100644
--- a/server/src/queries/library.repository.sql
+++ b/server/src/queries/library.repository.sql
@@ -9,7 +9,6 @@ FROM
       "LibraryEntity"."id" AS "LibraryEntity_id",
       "LibraryEntity"."name" AS "LibraryEntity_name",
       "LibraryEntity"."ownerId" AS "LibraryEntity_ownerId",
-      "LibraryEntity"."type" AS "LibraryEntity_type",
       "LibraryEntity"."importPaths" AS "LibraryEntity_importPaths",
       "LibraryEntity"."exclusionPatterns" AS "LibraryEntity_exclusionPatterns",
       "LibraryEntity"."createdAt" AS "LibraryEntity_createdAt",
@@ -77,53 +76,11 @@ WHERE
   ((("LibraryEntity"."ownerId" = $1)))
   AND ("LibraryEntity"."deletedAt" IS NULL)
 
--- LibraryRepository.getDefaultUploadLibrary
-SELECT
-  "LibraryEntity"."id" AS "LibraryEntity_id",
-  "LibraryEntity"."name" AS "LibraryEntity_name",
-  "LibraryEntity"."ownerId" AS "LibraryEntity_ownerId",
-  "LibraryEntity"."type" AS "LibraryEntity_type",
-  "LibraryEntity"."importPaths" AS "LibraryEntity_importPaths",
-  "LibraryEntity"."exclusionPatterns" AS "LibraryEntity_exclusionPatterns",
-  "LibraryEntity"."createdAt" AS "LibraryEntity_createdAt",
-  "LibraryEntity"."updatedAt" AS "LibraryEntity_updatedAt",
-  "LibraryEntity"."deletedAt" AS "LibraryEntity_deletedAt",
-  "LibraryEntity"."refreshedAt" AS "LibraryEntity_refreshedAt"
-FROM
-  "libraries" "LibraryEntity"
-WHERE
-  (
-    (
-      ("LibraryEntity"."ownerId" = $1)
-      AND ("LibraryEntity"."type" = $2)
-    )
-  )
-  AND ("LibraryEntity"."deletedAt" IS NULL)
-ORDER BY
-  "LibraryEntity"."createdAt" ASC
-LIMIT
-  1
-
--- LibraryRepository.getUploadLibraryCount
-SELECT
-  COUNT(1) AS "cnt"
-FROM
-  "libraries" "LibraryEntity"
-WHERE
-  (
-    (
-      ("LibraryEntity"."ownerId" = $1)
-      AND ("LibraryEntity"."type" = $2)
-    )
-  )
-  AND ("LibraryEntity"."deletedAt" IS NULL)
-
 -- LibraryRepository.getAllByUserId
 SELECT
   "LibraryEntity"."id" AS "LibraryEntity_id",
   "LibraryEntity"."name" AS "LibraryEntity_name",
   "LibraryEntity"."ownerId" AS "LibraryEntity_ownerId",
-  "LibraryEntity"."type" AS "LibraryEntity_type",
   "LibraryEntity"."importPaths" AS "LibraryEntity_importPaths",
   "LibraryEntity"."exclusionPatterns" AS "LibraryEntity_exclusionPatterns",
   "LibraryEntity"."createdAt" AS "LibraryEntity_createdAt",
@@ -163,7 +120,6 @@ SELECT
   "LibraryEntity"."id" AS "LibraryEntity_id",
   "LibraryEntity"."name" AS "LibraryEntity_name",
   "LibraryEntity"."ownerId" AS "LibraryEntity_ownerId",
-  "LibraryEntity"."type" AS "LibraryEntity_type",
   "LibraryEntity"."importPaths" AS "LibraryEntity_importPaths",
   "LibraryEntity"."exclusionPatterns" AS "LibraryEntity_exclusionPatterns",
   "LibraryEntity"."createdAt" AS "LibraryEntity_createdAt",
@@ -202,7 +158,6 @@ SELECT
   "LibraryEntity"."id" AS "LibraryEntity_id",
   "LibraryEntity"."name" AS "LibraryEntity_name",
   "LibraryEntity"."ownerId" AS "LibraryEntity_ownerId",
-  "LibraryEntity"."type" AS "LibraryEntity_type",
   "LibraryEntity"."importPaths" AS "LibraryEntity_importPaths",
   "LibraryEntity"."exclusionPatterns" AS "LibraryEntity_exclusionPatterns",
   "LibraryEntity"."createdAt" AS "LibraryEntity_createdAt",
@@ -238,7 +193,6 @@ SELECT
   "libraries"."id" AS "libraries_id",
   "libraries"."name" AS "libraries_name",
   "libraries"."ownerId" AS "libraries_ownerId",
-  "libraries"."type" AS "libraries_type",
   "libraries"."importPaths" AS "libraries_importPaths",
   "libraries"."exclusionPatterns" AS "libraries_exclusionPatterns",
   "libraries"."createdAt" AS "libraries_createdAt",
diff --git a/server/src/queries/user.repository.sql b/server/src/queries/user.repository.sql
index 30464da78..d27b83fdd 100644
--- a/server/src/queries/user.repository.sql
+++ b/server/src/queries/user.repository.sql
@@ -167,12 +167,10 @@ SET
       COALESCE(SUM(exif."fileSizeInByte"), 0)
     FROM
       "assets" "assets"
-      LEFT JOIN "libraries" "library" ON "library"."id" = "assets"."libraryId"
-      AND ("library"."deletedAt" IS NULL)
       LEFT JOIN "exif" "exif" ON "exif"."assetId" = "assets"."id"
     WHERE
       "assets"."ownerId" = users.id
-      AND "library"."type" = 'UPLOAD'
+      AND "assets"."libraryId" IS NULL
   ),
   "updatedAt" = CURRENT_TIMESTAMP
 WHERE
diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts
index 992f8f143..17746b155 100644
--- a/server/src/repositories/access.repository.ts
+++ b/server/src/repositories/access.repository.ts
@@ -20,7 +20,6 @@ type IActivityAccess = IAccessRepository['activity'];
 type IAlbumAccess = IAccessRepository['album'];
 type IAssetAccess = IAccessRepository['asset'];
 type IAuthDeviceAccess = IAccessRepository['authDevice'];
-type ILibraryAccess = IAccessRepository['library'];
 type ITimelineAccess = IAccessRepository['timeline'];
 type IMemoryAccess = IAccessRepository['memory'];
 type IPersonAccess = IAccessRepository['person'];
@@ -313,28 +312,6 @@ class AuthDeviceAccess implements IAuthDeviceAccess {
   }
 }
 
-class LibraryAccess implements ILibraryAccess {
-  constructor(private libraryRepository: Repository<LibraryEntity>) {}
-
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID_SET] })
-  @ChunkedSet({ paramIndex: 1 })
-  async checkOwnerAccess(userId: string, libraryIds: Set<string>): Promise<Set<string>> {
-    if (libraryIds.size === 0) {
-      return new Set();
-    }
-
-    return this.libraryRepository
-      .find({
-        select: { id: true },
-        where: {
-          id: In([...libraryIds]),
-          ownerId: userId,
-        },
-      })
-      .then((libraries) => new Set(libraries.map((library) => library.id)));
-  }
-}
-
 class TimelineAccess implements ITimelineAccess {
   constructor(private partnerRepository: Repository<PartnerEntity>) {}
 
@@ -447,7 +424,6 @@ export class AccessRepository implements IAccessRepository {
   album: IAlbumAccess;
   asset: IAssetAccess;
   authDevice: IAuthDeviceAccess;
-  library: ILibraryAccess;
   memory: IMemoryAccess;
   person: IPersonAccess;
   partner: IPartnerAccess;
@@ -469,7 +445,6 @@ export class AccessRepository implements IAccessRepository {
     this.album = new AlbumAccess(albumRepository, sharedLinkRepository);
     this.asset = new AssetAccess(albumRepository, assetRepository, partnerRepository, sharedLinkRepository);
     this.authDevice = new AuthDeviceAccess(sessionRepository);
-    this.library = new LibraryAccess(libraryRepository);
     this.memory = new MemoryAccess(memoryRepository);
     this.person = new PersonAccess(assetFaceRepository, personRepository);
     this.partner = new PartnerAccess(partnerRepository);
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index b4869b9fb..9a68b4e70 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -5,7 +5,6 @@ import { AlbumEntity, AssetOrder } from 'src/entities/album.entity';
 import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { ExifEntity } from 'src/entities/exif.entity';
-import { LibraryType } from 'src/entities/library.entity';
 import { PartnerEntity } from 'src/entities/partner.entity';
 import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import {
@@ -292,8 +291,13 @@ export class AssetRepository implements IAssetRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.BUFFER] })
-  getByChecksum(libraryId: string, checksum: Buffer): Promise<AssetEntity | null> {
-    return this.repository.findOne({ where: { libraryId, checksum } });
+  getByChecksum(libraryId: string | null, checksum: Buffer): Promise<AssetEntity | null> {
+    return this.repository.findOne({
+      where: {
+        libraryId: libraryId || IsNull(),
+        checksum,
+      },
+    });
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.BUFFER] })
@@ -303,9 +307,7 @@ export class AssetRepository implements IAssetRepository {
       where: {
         ownerId,
         checksum,
-        library: {
-          type: LibraryType.UPLOAD,
-        },
+        library: IsNull(),
       },
       withDeleted: true,
     });
diff --git a/server/src/repositories/library.repository.ts b/server/src/repositories/library.repository.ts
index 25eb01035..ca7078072 100644
--- a/server/src/repositories/library.repository.ts
+++ b/server/src/repositories/library.repository.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { LibraryStatsResponseDto } from 'src/dtos/library.dto';
-import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
+import { LibraryEntity } from 'src/entities/library.entity';
 import { ILibraryRepository } from 'src/interfaces/library.interface';
 import { Instrumentation } from 'src/utils/instrumentation';
 import { EntityNotFoundError, IsNull, Not } from 'typeorm';
@@ -40,34 +40,10 @@ export class LibraryRepository implements ILibraryRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  getDefaultUploadLibrary(ownerId: string): Promise<LibraryEntity | null> {
-    return this.repository.findOne({
-      where: {
-        ownerId: ownerId,
-        type: LibraryType.UPLOAD,
-      },
-      order: {
-        createdAt: 'ASC',
-      },
-    });
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  getUploadLibraryCount(ownerId: string): Promise<number> {
-    return this.repository.count({
-      where: {
-        ownerId: ownerId,
-        type: LibraryType.UPLOAD,
-      },
-    });
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  getAllByUserId(ownerId: string, type?: LibraryType): Promise<LibraryEntity[]> {
+  getAllByUserId(ownerId: string): Promise<LibraryEntity[]> {
     return this.repository.find({
       where: {
         ownerId,
-        type,
       },
       relations: {
         owner: true,
@@ -79,9 +55,8 @@ export class LibraryRepository implements ILibraryRepository {
   }
 
   @GenerateSql({ params: [] })
-  getAll(withDeleted = false, type?: LibraryType): Promise<LibraryEntity[]> {
+  getAll(withDeleted = false): Promise<LibraryEntity[]> {
     return this.repository.find({
-      where: { type },
       relations: {
         owner: true,
       },
diff --git a/server/src/repositories/user.repository.ts b/server/src/repositories/user.repository.ts
index 4f62732e7..6829bb024 100644
--- a/server/src/repositories/user.repository.ts
+++ b/server/src/repositories/user.repository.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { LibraryType } from 'src/entities/library.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import {
   IUserRepository,
@@ -123,10 +122,9 @@ export class UserRepository implements IUserRepository {
     const subQuery = this.assetRepository
       .createQueryBuilder('assets')
       .select('COALESCE(SUM(exif."fileSizeInByte"), 0)')
-      .leftJoin('assets.library', 'library')
       .leftJoin('assets.exifInfo', 'exif')
       .where('assets.ownerId = users.id')
-      .andWhere(`library.type = '${LibraryType.UPLOAD}'`)
+      .andWhere(`assets.libraryId IS NULL`)
       .withDeleted();
 
     const query = this.userRepository
diff --git a/server/src/services/asset-v1.service.spec.ts b/server/src/services/asset-v1.service.spec.ts
index 40211ee40..89485d266 100644
--- a/server/src/services/asset-v1.service.spec.ts
+++ b/server/src/services/asset-v1.service.spec.ts
@@ -32,7 +32,6 @@ const _getCreateAssetDto = (): CreateAssetDto => {
   createAssetDto.isFavorite = false;
   createAssetDto.isArchived = false;
   createAssetDto.duration = '0:00:00.000000';
-  createAssetDto.libraryId = 'libraryId';
 
   return createAssetDto;
 };
@@ -121,7 +120,6 @@ describe('AssetService', () => {
       const dto = _getCreateAssetDto();
 
       assetMock.create.mockResolvedValue(assetEntity);
-      accessMock.library.checkOwnerAccess.mockResolvedValue(new Set([dto.libraryId!]));
 
       await expect(sut.uploadFile(authStub.user1, dto, file)).resolves.toEqual({ duplicate: false, id: 'id_1' });
 
@@ -149,7 +147,6 @@ describe('AssetService', () => {
 
       assetMock.create.mockRejectedValue(error);
       assetRepositoryMockV1.getAssetsByChecksums.mockResolvedValue([_getAsset_1()]);
-      accessMock.library.checkOwnerAccess.mockResolvedValue(new Set([dto.libraryId!]));
 
       await expect(sut.uploadFile(authStub.user1, dto, file)).resolves.toEqual({ duplicate: true, id: 'id_1' });
 
@@ -167,7 +164,6 @@ describe('AssetService', () => {
 
       assetMock.create.mockResolvedValueOnce(assetStub.livePhotoMotionAsset);
       assetMock.create.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
-      accessMock.library.checkOwnerAccess.mockResolvedValue(new Set([dto.libraryId!]));
 
       await expect(
         sut.uploadFile(authStub.user1, dto, fileStub.livePhotoStill, fileStub.livePhotoMotion),
diff --git a/server/src/services/asset-v1.service.ts b/server/src/services/asset-v1.service.ts
index bd6f54006..6868ca2da 100644
--- a/server/src/services/asset-v1.service.ts
+++ b/server/src/services/asset-v1.service.ts
@@ -25,7 +25,6 @@ import {
 } from 'src/dtos/asset-v1.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity, AssetType } from 'src/entities/asset.entity';
-import { LibraryType } from 'src/entities/library.entity';
 import { IAccessRepository } from 'src/interfaces/access.interface';
 import { IAssetRepositoryV1 } from 'src/interfaces/asset-v1.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
@@ -76,15 +75,20 @@ export class AssetServiceV1 {
     let livePhotoAsset: AssetEntity | null = null;
 
     try {
-      const libraryId = await this.getLibraryId(auth, dto.libraryId);
-      await this.access.requirePermission(auth, Permission.ASSET_UPLOAD, libraryId);
+      await this.access.requirePermission(
+        auth,
+        Permission.ASSET_UPLOAD,
+        // do not need an id here, but the interface requires it
+        auth.user.id,
+      );
+
       this.requireQuota(auth, file.size);
       if (livePhotoFile) {
-        const livePhotoDto = { ...dto, assetType: AssetType.VIDEO, isVisible: false, libraryId };
+        const livePhotoDto = { ...dto, assetType: AssetType.VIDEO, isVisible: false };
         livePhotoAsset = await this.create(auth, livePhotoDto, livePhotoFile);
       }
 
-      const asset = await this.create(auth, { ...dto, libraryId }, file, livePhotoAsset?.id, sidecarFile?.originalPath);
+      const asset = await this.create(auth, dto, file, livePhotoAsset?.id, sidecarFile?.originalPath);
 
       await this.userRepository.updateUsage(auth.user.id, (livePhotoFile?.size || 0) + file.size);
 
@@ -245,36 +249,16 @@ export class AssetServiceV1 {
     return asset.previewPath;
   }
 
-  private async getLibraryId(auth: AuthDto, libraryId?: string) {
-    if (libraryId) {
-      return libraryId;
-    }
-
-    let library = await this.libraryRepository.getDefaultUploadLibrary(auth.user.id);
-    if (!library) {
-      library = await this.libraryRepository.create({
-        ownerId: auth.user.id,
-        name: 'Default Library',
-        assets: [],
-        type: LibraryType.UPLOAD,
-        importPaths: [],
-        exclusionPatterns: [],
-      });
-    }
-
-    return library.id;
-  }
-
   private async create(
     auth: AuthDto,
-    dto: CreateAssetDto & { libraryId: string },
+    dto: CreateAssetDto,
     file: UploadFile,
     livePhotoAssetId?: string,
     sidecarPath?: string,
   ): Promise<AssetEntity> {
     const asset = await this.assetRepository.create({
       ownerId: auth.user.id,
-      libraryId: dto.libraryId,
+      libraryId: null,
 
       checksum: file.checksum,
       originalPath: file.originalPath,
diff --git a/server/src/services/asset.service.ts b/server/src/services/asset.service.ts
index d266b1ed2..c37d8d8b6 100644
--- a/server/src/services/asset.service.ts
+++ b/server/src/services/asset.service.ts
@@ -27,7 +27,6 @@ import { AuthDto } from 'src/dtos/auth.dto';
 import { MapMarkerDto, MapMarkerResponseDto, MemoryLaneDto } from 'src/dtos/search.dto';
 import { UpdateStackParentDto } from 'src/dtos/stack.dto';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { LibraryType } from 'src/entities/library.entity';
 import { IAccessRepository } from 'src/interfaces/access.interface';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
@@ -424,7 +423,7 @@ export class AssetService {
     }
 
     await this.assetRepository.remove(asset);
-    if (asset.library.type === LibraryType.UPLOAD) {
+    if (!asset.libraryId) {
       await this.userRepository.updateUsage(asset.ownerId, -(asset.exifInfo?.fileSizeInByte || 0));
     }
     this.eventRepository.clientSend(ClientEvent.ASSET_DELETE, asset.ownerId, id);
@@ -436,7 +435,7 @@ export class AssetService {
 
     const files = [asset.thumbnailPath, asset.previewPath, asset.encodedVideoPath];
     // skip originals if the user deleted the whole library
-    if (!asset.library.deletedAt) {
+    if (!asset.library?.deletedAt) {
       files.push(asset.sidecarPath, asset.originalPath);
     }
 
diff --git a/server/src/services/download.service.spec.ts b/server/src/services/download.service.spec.ts
index 331ddcaaa..48231a11a 100644
--- a/server/src/services/download.service.spec.ts
+++ b/server/src/services/download.service.spec.ts
@@ -180,7 +180,6 @@ describe(DownloadService.name, () => {
     });
 
     it('should return a list of archives (userId)', async () => {
-      accessMock.library.checkOwnerAccess.mockResolvedValue(new Set([authStub.admin.user.id]));
       assetMock.getByUserId.mockResolvedValue({
         items: [assetStub.image, assetStub.video],
         hasNextPage: false,
@@ -196,8 +195,6 @@ describe(DownloadService.name, () => {
     });
 
     it('should split archives by size', async () => {
-      accessMock.library.checkOwnerAccess.mockResolvedValue(new Set([authStub.admin.user.id]));
-
       assetMock.getByUserId.mockResolvedValue({
         items: [
           { ...assetStub.image, id: 'asset-1' },
diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts
index 9f2cb073c..b63df692a 100644
--- a/server/src/services/library.service.spec.ts
+++ b/server/src/services/library.service.spec.ts
@@ -4,7 +4,6 @@ import { SystemConfig } from 'src/config';
 import { SystemConfigCore } from 'src/cores/system-config.core';
 import { mapLibrary } from 'src/dtos/library.dto';
 import { AssetType } from 'src/entities/asset.entity';
-import { LibraryType } from 'src/entities/library.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
@@ -213,18 +212,6 @@ describe(LibraryService.name, () => {
       ]);
     });
 
-    it('should not scan upload libraries', async () => {
-      const mockLibraryJob: ILibraryRefreshJob = {
-        id: libraryStub.externalLibrary1.id,
-        refreshModifiedFiles: false,
-        refreshAllFiles: false,
-      };
-
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
-
-      await expect(sut.handleQueueAssetRefresh(mockLibraryJob)).resolves.toBe(JobStatus.FAILED);
-    });
-
     it('should ignore import paths that do not exist', async () => {
       storageMock.stat.mockImplementation((path): Promise<Stats> => {
         if (path === libraryStub.externalLibraryWithImportPaths1.importPaths[0]) {
@@ -707,7 +694,6 @@ describe(LibraryService.name, () => {
   describe('delete', () => {
     it('should delete a library', async () => {
       assetMock.getByLibraryIdAndOriginalPath.mockResolvedValue(assetStub.image);
-      libraryMock.getUploadLibraryCount.mockResolvedValue(2);
       libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
 
       await sut.delete(libraryStub.externalLibrary1.id);
@@ -720,21 +706,8 @@ describe(LibraryService.name, () => {
       expect(libraryMock.softDelete).toHaveBeenCalledWith(libraryStub.externalLibrary1.id);
     });
 
-    it('should throw error if the last upload library is deleted', async () => {
-      assetMock.getByLibraryIdAndOriginalPath.mockResolvedValue(assetStub.image);
-      libraryMock.getUploadLibraryCount.mockResolvedValue(1);
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
-
-      await expect(sut.delete(libraryStub.uploadLibrary1.id)).rejects.toBeInstanceOf(BadRequestException);
-
-      expect(jobMock.queue).not.toHaveBeenCalled();
-      expect(jobMock.queueAll).not.toHaveBeenCalled();
-      expect(libraryMock.softDelete).not.toHaveBeenCalled();
-    });
-
     it('should allow an external library to be deleted', async () => {
       assetMock.getByLibraryIdAndOriginalPath.mockResolvedValue(assetStub.image);
-      libraryMock.getUploadLibraryCount.mockResolvedValue(1);
       libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
 
       await sut.delete(libraryStub.externalLibrary1.id);
@@ -749,7 +722,6 @@ describe(LibraryService.name, () => {
 
     it('should unwatch an external library when deleted', async () => {
       assetMock.getByLibraryIdAndOriginalPath.mockResolvedValue(assetStub.image);
-      libraryMock.getUploadLibraryCount.mockResolvedValue(1);
       libraryMock.get.mockResolvedValue(libraryStub.externalLibraryWithImportPaths1);
       libraryMock.getAll.mockResolvedValue([libraryStub.externalLibraryWithImportPaths1]);
 
@@ -767,37 +739,37 @@ describe(LibraryService.name, () => {
 
   describe('get', () => {
     it('should return a library', async () => {
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
-      await expect(sut.get(libraryStub.uploadLibrary1.id)).resolves.toEqual(
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
+      await expect(sut.get(libraryStub.externalLibrary1.id)).resolves.toEqual(
         expect.objectContaining({
-          id: libraryStub.uploadLibrary1.id,
-          name: libraryStub.uploadLibrary1.name,
-          ownerId: libraryStub.uploadLibrary1.ownerId,
+          id: libraryStub.externalLibrary1.id,
+          name: libraryStub.externalLibrary1.name,
+          ownerId: libraryStub.externalLibrary1.ownerId,
         }),
       );
 
-      expect(libraryMock.get).toHaveBeenCalledWith(libraryStub.uploadLibrary1.id);
+      expect(libraryMock.get).toHaveBeenCalledWith(libraryStub.externalLibrary1.id);
     });
 
     it('should throw an error when a library is not found', async () => {
       libraryMock.get.mockResolvedValue(null);
-      await expect(sut.get(libraryStub.uploadLibrary1.id)).rejects.toBeInstanceOf(BadRequestException);
-      expect(libraryMock.get).toHaveBeenCalledWith(libraryStub.uploadLibrary1.id);
+      await expect(sut.get(libraryStub.externalLibrary1.id)).rejects.toBeInstanceOf(BadRequestException);
+      expect(libraryMock.get).toHaveBeenCalledWith(libraryStub.externalLibrary1.id);
     });
   });
 
   describe('getStatistics', () => {
     it('should return library statistics', async () => {
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
       libraryMock.getStatistics.mockResolvedValue({ photos: 10, videos: 0, total: 10, usage: 1337 });
-      await expect(sut.getStatistics(libraryStub.uploadLibrary1.id)).resolves.toEqual({
+      await expect(sut.getStatistics(libraryStub.externalLibrary1.id)).resolves.toEqual({
         photos: 10,
         videos: 0,
         total: 10,
         usage: 1337,
       });
 
-      expect(libraryMock.getStatistics).toHaveBeenCalledWith(libraryStub.uploadLibrary1.id);
+      expect(libraryMock.getStatistics).toHaveBeenCalledWith(libraryStub.externalLibrary1.id);
     });
   });
 
@@ -805,10 +777,9 @@ describe(LibraryService.name, () => {
     describe('external library', () => {
       it('should create with default settings', async () => {
         libraryMock.create.mockResolvedValue(libraryStub.externalLibrary1);
-        await expect(sut.create({ ownerId: authStub.admin.user.id, type: LibraryType.EXTERNAL })).resolves.toEqual(
+        await expect(sut.create({ ownerId: authStub.admin.user.id })).resolves.toEqual(
           expect.objectContaining({
             id: libraryStub.externalLibrary1.id,
-            type: LibraryType.EXTERNAL,
             name: libraryStub.externalLibrary1.name,
             ownerId: libraryStub.externalLibrary1.ownerId,
             assetCount: 0,
@@ -823,7 +794,6 @@ describe(LibraryService.name, () => {
         expect(libraryMock.create).toHaveBeenCalledWith(
           expect.objectContaining({
             name: expect.any(String),
-            type: LibraryType.EXTERNAL,
             importPaths: [],
             exclusionPatterns: [],
           }),
@@ -832,12 +802,9 @@ describe(LibraryService.name, () => {
 
       it('should create with name', async () => {
         libraryMock.create.mockResolvedValue(libraryStub.externalLibrary1);
-        await expect(
-          sut.create({ ownerId: authStub.admin.user.id, type: LibraryType.EXTERNAL, name: 'My Awesome Library' }),
-        ).resolves.toEqual(
+        await expect(sut.create({ ownerId: authStub.admin.user.id, name: 'My Awesome Library' })).resolves.toEqual(
           expect.objectContaining({
             id: libraryStub.externalLibrary1.id,
-            type: LibraryType.EXTERNAL,
             name: libraryStub.externalLibrary1.name,
             ownerId: libraryStub.externalLibrary1.ownerId,
             assetCount: 0,
@@ -852,7 +819,6 @@ describe(LibraryService.name, () => {
         expect(libraryMock.create).toHaveBeenCalledWith(
           expect.objectContaining({
             name: 'My Awesome Library',
-            type: LibraryType.EXTERNAL,
             importPaths: [],
             exclusionPatterns: [],
           }),
@@ -864,13 +830,11 @@ describe(LibraryService.name, () => {
         await expect(
           sut.create({
             ownerId: authStub.admin.user.id,
-            type: LibraryType.EXTERNAL,
             importPaths: ['/data/images', '/data/videos'],
           }),
         ).resolves.toEqual(
           expect.objectContaining({
             id: libraryStub.externalLibrary1.id,
-            type: LibraryType.EXTERNAL,
             name: libraryStub.externalLibrary1.name,
             ownerId: libraryStub.externalLibrary1.ownerId,
             assetCount: 0,
@@ -885,7 +849,6 @@ describe(LibraryService.name, () => {
         expect(libraryMock.create).toHaveBeenCalledWith(
           expect.objectContaining({
             name: expect.any(String),
-            type: LibraryType.EXTERNAL,
             importPaths: ['/data/images', '/data/videos'],
             exclusionPatterns: [],
           }),
@@ -901,7 +864,6 @@ describe(LibraryService.name, () => {
         await sut.init();
         await sut.create({
           ownerId: authStub.admin.user.id,
-          type: LibraryType.EXTERNAL,
           importPaths: libraryStub.externalLibraryWithImportPaths1.importPaths,
         });
       });
@@ -911,13 +873,11 @@ describe(LibraryService.name, () => {
         await expect(
           sut.create({
             ownerId: authStub.admin.user.id,
-            type: LibraryType.EXTERNAL,
             exclusionPatterns: ['*.tmp', '*.bak'],
           }),
         ).resolves.toEqual(
           expect.objectContaining({
             id: libraryStub.externalLibrary1.id,
-            type: LibraryType.EXTERNAL,
             name: libraryStub.externalLibrary1.name,
             ownerId: libraryStub.externalLibrary1.ownerId,
             assetCount: 0,
@@ -932,105 +892,22 @@ describe(LibraryService.name, () => {
         expect(libraryMock.create).toHaveBeenCalledWith(
           expect.objectContaining({
             name: expect.any(String),
-            type: LibraryType.EXTERNAL,
             importPaths: [],
             exclusionPatterns: ['*.tmp', '*.bak'],
           }),
         );
       });
     });
-
-    describe('upload library', () => {
-      it('should create with default settings', async () => {
-        libraryMock.create.mockResolvedValue(libraryStub.uploadLibrary1);
-        await expect(sut.create({ ownerId: authStub.admin.user.id, type: LibraryType.UPLOAD })).resolves.toEqual(
-          expect.objectContaining({
-            id: libraryStub.uploadLibrary1.id,
-            type: LibraryType.UPLOAD,
-            name: libraryStub.uploadLibrary1.name,
-            ownerId: libraryStub.uploadLibrary1.ownerId,
-            assetCount: 0,
-            importPaths: [],
-            exclusionPatterns: [],
-            createdAt: libraryStub.uploadLibrary1.createdAt,
-            updatedAt: libraryStub.uploadLibrary1.updatedAt,
-            refreshedAt: null,
-          }),
-        );
-
-        expect(libraryMock.create).toHaveBeenCalledWith(
-          expect.objectContaining({
-            name: 'New Upload Library',
-            type: LibraryType.UPLOAD,
-            importPaths: [],
-            exclusionPatterns: [],
-          }),
-        );
-      });
-
-      it('should create with name', async () => {
-        libraryMock.create.mockResolvedValue(libraryStub.uploadLibrary1);
-        await expect(
-          sut.create({ ownerId: authStub.admin.user.id, type: LibraryType.UPLOAD, name: 'My Awesome Library' }),
-        ).resolves.toEqual(
-          expect.objectContaining({
-            id: libraryStub.uploadLibrary1.id,
-            type: LibraryType.UPLOAD,
-            name: libraryStub.uploadLibrary1.name,
-            ownerId: libraryStub.uploadLibrary1.ownerId,
-            assetCount: 0,
-            importPaths: [],
-            exclusionPatterns: [],
-            createdAt: libraryStub.uploadLibrary1.createdAt,
-            updatedAt: libraryStub.uploadLibrary1.updatedAt,
-            refreshedAt: null,
-          }),
-        );
-
-        expect(libraryMock.create).toHaveBeenCalledWith(
-          expect.objectContaining({
-            name: 'My Awesome Library',
-            type: LibraryType.UPLOAD,
-            importPaths: [],
-            exclusionPatterns: [],
-          }),
-        );
-      });
-
-      it('should not create with import paths', async () => {
-        await expect(
-          sut.create({
-            ownerId: authStub.admin.user.id,
-            type: LibraryType.UPLOAD,
-            importPaths: ['/data/images', '/data/videos'],
-          }),
-        ).rejects.toBeInstanceOf(BadRequestException);
-
-        expect(libraryMock.create).not.toHaveBeenCalled();
-      });
-
-      it('should not create with exclusion patterns', async () => {
-        await expect(
-          sut.create({
-            ownerId: authStub.admin.user.id,
-            type: LibraryType.UPLOAD,
-            exclusionPatterns: ['*.tmp', '*.bak'],
-          }),
-        ).rejects.toBeInstanceOf(BadRequestException);
-
-        expect(libraryMock.create).not.toHaveBeenCalled();
-      });
-    });
   });
 
   describe('handleQueueCleanup', () => {
     it('should queue cleanup jobs', async () => {
-      libraryMock.getAllDeleted.mockResolvedValue([libraryStub.uploadLibrary1, libraryStub.externalLibrary1]);
+      libraryMock.getAllDeleted.mockResolvedValue([libraryStub.externalLibrary1, libraryStub.externalLibrary2]);
       await expect(sut.handleQueueCleanup()).resolves.toBe(JobStatus.SUCCESS);
 
       expect(jobMock.queueAll).toHaveBeenCalledWith([
-        { name: JobName.LIBRARY_DELETE, data: { id: libraryStub.uploadLibrary1.id } },
         { name: JobName.LIBRARY_DELETE, data: { id: libraryStub.externalLibrary1.id } },
+        { name: JobName.LIBRARY_DELETE, data: { id: libraryStub.externalLibrary2.id } },
       ]);
     });
   });
@@ -1044,9 +921,9 @@ describe(LibraryService.name, () => {
     });
 
     it('should update library', async () => {
-      libraryMock.update.mockResolvedValue(libraryStub.uploadLibrary1);
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
-      await expect(sut.update('library-id', {})).resolves.toEqual(mapLibrary(libraryStub.uploadLibrary1));
+      libraryMock.update.mockResolvedValue(libraryStub.externalLibrary1);
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
+      await expect(sut.update('library-id', {})).resolves.toEqual(mapLibrary(libraryStub.externalLibrary1));
       expect(libraryMock.update).toHaveBeenCalledWith(expect.objectContaining({ id: 'library-id' }));
     });
   });
@@ -1109,15 +986,6 @@ describe(LibraryService.name, () => {
         expect(storageMock.watch).not.toHaveBeenCalled();
       });
 
-      it('should throw error when watching upload library', async () => {
-        libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
-        libraryMock.getAll.mockResolvedValue([libraryStub.uploadLibrary1]);
-
-        await expect(sut.watchAll()).rejects.toThrow('Can only watch external libraries');
-
-        expect(storageMock.watch).not.toHaveBeenCalled();
-      });
-
       it('should handle a new file event', async () => {
         libraryMock.get.mockResolvedValue(libraryStub.externalLibraryWithImportPaths1);
         libraryMock.getAll.mockResolvedValue([libraryStub.externalLibraryWithImportPaths1]);
@@ -1253,25 +1121,25 @@ describe(LibraryService.name, () => {
       libraryMock.getAssetIds.mockResolvedValue([]);
       libraryMock.delete.mockImplementation(async () => {});
 
-      await expect(sut.handleDeleteLibrary({ id: libraryStub.uploadLibrary1.id })).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handleDeleteLibrary({ id: libraryStub.externalLibrary1.id })).resolves.toBe(JobStatus.FAILED);
     });
 
     it('should delete an empty library', async () => {
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
       libraryMock.getAssetIds.mockResolvedValue([]);
       libraryMock.delete.mockImplementation(async () => {});
 
-      await expect(sut.handleDeleteLibrary({ id: libraryStub.uploadLibrary1.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleDeleteLibrary({ id: libraryStub.externalLibrary1.id })).resolves.toBe(JobStatus.SUCCESS);
     });
 
     it('should delete a library with assets', async () => {
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
       libraryMock.getAssetIds.mockResolvedValue([assetStub.image1.id]);
       libraryMock.delete.mockImplementation(async () => {});
 
       assetMock.getById.mockResolvedValue(assetStub.image1);
 
-      await expect(sut.handleDeleteLibrary({ id: libraryStub.uploadLibrary1.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleDeleteLibrary({ id: libraryStub.externalLibrary1.id })).resolves.toBe(JobStatus.SUCCESS);
     });
   });
 
@@ -1295,14 +1163,6 @@ describe(LibraryService.name, () => {
       ]);
     });
 
-    it('should not queue a library scan of upload library', async () => {
-      libraryMock.get.mockResolvedValue(libraryStub.uploadLibrary1);
-
-      await expect(sut.queueScan(libraryStub.uploadLibrary1.id, {})).rejects.toBeInstanceOf(BadRequestException);
-
-      expect(jobMock.queue).not.toBeCalled();
-    });
-
     it('should queue a library scan of all modified assets', async () => {
       libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
 
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index fb6991d01..3a87c418b 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -12,7 +12,6 @@ import {
   LibraryResponseDto,
   LibraryStatsResponseDto,
   ScanLibraryDto,
-  SearchLibraryDto,
   UpdateLibraryDto,
   ValidateLibraryDto,
   ValidateLibraryImportPathResponseDto,
@@ -20,7 +19,7 @@ import {
   mapLibrary,
 } from 'src/dtos/library.dto';
 import { AssetType } from 'src/entities/asset.entity';
-import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
+import { LibraryEntity } from 'src/entities/library.entity';
 import { IAssetRepository, WithProperty } from 'src/interfaces/asset.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { DatabaseLock, IDatabaseRepository } from 'src/interfaces/database.interface';
@@ -118,10 +117,7 @@ export class LibraryService {
     }
 
     const library = await this.findOrFail(id);
-
-    if (library.type !== LibraryType.EXTERNAL) {
-      throw new BadRequestException('Can only watch external libraries');
-    } else if (library.importPaths.length === 0) {
+    if (library.importPaths.length === 0) {
       return false;
     }
 
@@ -212,8 +208,7 @@ export class LibraryService {
       return false;
     }
 
-    const libraries = await this.repository.getAll(false, LibraryType.EXTERNAL);
-
+    const libraries = await this.repository.getAll(false);
     for (const library of libraries) {
       await this.watch(library.id);
     }
@@ -229,8 +224,8 @@ export class LibraryService {
     return mapLibrary(library);
   }
 
-  async getAll(dto: SearchLibraryDto): Promise<LibraryResponseDto[]> {
-    const libraries = await this.repository.getAll(false, dto.type);
+  async getAll(): Promise<LibraryResponseDto[]> {
+    const libraries = await this.repository.getAll(false);
     return libraries.map((library) => mapLibrary(library));
   }
 
@@ -244,37 +239,12 @@ export class LibraryService {
   }
 
   async create(dto: CreateLibraryDto): Promise<LibraryResponseDto> {
-    switch (dto.type) {
-      case LibraryType.EXTERNAL: {
-        if (!dto.name) {
-          dto.name = 'New External Library';
-        }
-        break;
-      }
-      case LibraryType.UPLOAD: {
-        if (!dto.name) {
-          dto.name = 'New Upload Library';
-        }
-        if (dto.importPaths && dto.importPaths.length > 0) {
-          throw new BadRequestException('Upload libraries cannot have import paths');
-        }
-        if (dto.exclusionPatterns && dto.exclusionPatterns.length > 0) {
-          throw new BadRequestException('Upload libraries cannot have exclusion patterns');
-        }
-        break;
-      }
-    }
-
     const library = await this.repository.create({
       ownerId: dto.ownerId,
-      name: dto.name,
-      type: dto.type,
+      name: dto.name ?? 'New External Library',
       importPaths: dto.importPaths ?? [],
       exclusionPatterns: dto.exclusionPatterns ?? [],
     });
-
-    this.logger.log(`Creating ${dto.type} library for ${dto.ownerId}}`);
-
     return mapLibrary(library);
   }
 
@@ -362,11 +332,7 @@ export class LibraryService {
   }
 
   async delete(id: string) {
-    const library = await this.findOrFail(id);
-    const uploadCount = await this.repository.getUploadLibraryCount(library.ownerId);
-    if (library.type === LibraryType.UPLOAD && uploadCount <= 1) {
-      throw new BadRequestException('Cannot delete the last upload library');
-    }
+    await this.findOrFail(id);
 
     if (this.watchLibraries) {
       await this.unwatch(id);
@@ -529,10 +495,7 @@ export class LibraryService {
   }
 
   async queueScan(id: string, dto: ScanLibraryDto) {
-    const library = await this.findOrFail(id);
-    if (library.type !== LibraryType.EXTERNAL) {
-      throw new BadRequestException('Can only refresh external libraries');
-    }
+    await this.findOrFail(id);
 
     await this.jobRepository.queue({
       name: JobName.LIBRARY_SCAN,
@@ -556,7 +519,7 @@ export class LibraryService {
     await this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_CLEANUP, data: {} });
 
     // Queue all library refresh
-    const libraries = await this.repository.getAll(true, LibraryType.EXTERNAL);
+    const libraries = await this.repository.getAll(true);
     await this.jobRepository.queueAll(
       libraries.map((library) => ({
         name: JobName.LIBRARY_SCAN,
@@ -587,8 +550,8 @@ export class LibraryService {
 
   async handleQueueAssetRefresh(job: ILibraryRefreshJob): Promise<JobStatus> {
     const library = await this.repository.get(job.id);
-    if (!library || library.type !== LibraryType.EXTERNAL) {
-      this.logger.warn('Can only refresh external libraries');
+    if (!library) {
+      this.logger.warn('Library not found');
       return JobStatus.FAILED;
     }
 
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index cca6d9eb1..7d7e2f91a 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -409,7 +409,7 @@ export class MetadataService {
       }
       const checksum = this.cryptoRepository.hashSha1(video);
 
-      let motionAsset = await this.assetRepository.getByChecksum(asset.libraryId, checksum);
+      let motionAsset = await this.assetRepository.getByChecksum(asset.libraryId ?? null, checksum);
       if (motionAsset) {
         this.logger.debug(
           `Asset ${asset.id}'s motion photo video with checksum ${checksum.toString(
diff --git a/server/test/fixtures/asset.stub.ts b/server/test/fixtures/asset.stub.ts
index 35a1790a3..e71094f45 100644
--- a/server/test/fixtures/asset.stub.ts
+++ b/server/test/fixtures/asset.stub.ts
@@ -48,8 +48,6 @@ export const assetStub = {
     deletedAt: null,
     isOffline: false,
     isExternal: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duplicateId: null,
   }),
 
@@ -84,8 +82,6 @@ export const assetStub = {
     sidecarPath: null,
     isOffline: false,
     isExternal: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     exifInfo: {
       fileSizeInByte: 123_000,
     } as ExifEntity,
@@ -114,8 +110,6 @@ export const assetStub = {
     isFavorite: true,
     isArchived: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     isExternal: false,
@@ -156,8 +150,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -203,8 +195,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -285,8 +275,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: true,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -364,8 +352,6 @@ export const assetStub = {
     isVisible: true,
     livePhotoVideo: null,
     livePhotoVideoId: null,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     isExternal: false,
     isOffline: false,
     tags: [],
@@ -401,8 +387,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -442,8 +426,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -467,8 +449,6 @@ export const assetStub = {
     isVisible: false,
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     exifInfo: {
       fileSizeInByte: 100_000,
       timeZone: `America/New_York`,
@@ -483,8 +463,6 @@ export const assetStub = {
     isVisible: false,
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     previewPath: '/uploads/user-id/thumbs/path.ext',
     thumbnailPath: '/uploads/user-id/webp/path.ext',
     exifInfo: {
@@ -502,8 +480,6 @@ export const assetStub = {
     isVisible: true,
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     exifInfo: {
       fileSizeInByte: 25_000,
       timeZone: `America/New_York`,
@@ -533,8 +509,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -576,8 +550,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -612,8 +584,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -649,8 +619,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -687,8 +655,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -807,8 +773,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -848,8 +812,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -891,8 +853,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
diff --git a/server/test/fixtures/error.stub.ts b/server/test/fixtures/error.stub.ts
index cea514e26..7e4399d7e 100644
--- a/server/test/fixtures/error.stub.ts
+++ b/server/test/fixtures/error.stub.ts
@@ -49,9 +49,4 @@ export const errorStub = {
     statusCode: 400,
     message: 'The server already has an admin',
   },
-  noDeleteUploadLibrary: {
-    error: 'Bad Request',
-    statusCode: 400,
-    message: 'Cannot delete the last upload library',
-  },
 };
diff --git a/server/test/fixtures/library.stub.ts b/server/test/fixtures/library.stub.ts
index bb95439d1..1a83ffe5d 100644
--- a/server/test/fixtures/library.stub.ts
+++ b/server/test/fixtures/library.stub.ts
@@ -1,30 +1,16 @@
 import { join } from 'node:path';
 import { APP_MEDIA_LOCATION } from 'src/constants';
 import { THUMBNAIL_DIR } from 'src/cores/storage.core';
-import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
+import { LibraryEntity } from 'src/entities/library.entity';
 import { userStub } from 'test/fixtures/user.stub';
 
 export const libraryStub = {
-  uploadLibrary1: Object.freeze<LibraryEntity>({
-    id: 'library-id',
-    name: 'test_library',
-    assets: [],
-    owner: userStub.user1,
-    ownerId: 'user-id',
-    type: LibraryType.UPLOAD,
-    importPaths: [],
-    createdAt: new Date('2022-01-01'),
-    updatedAt: new Date('2022-01-01'),
-    refreshedAt: null,
-    exclusionPatterns: [],
-  }),
   externalLibrary1: Object.freeze<LibraryEntity>({
     id: 'library-id',
     name: 'test_library',
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -37,7 +23,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2022-01-01'),
@@ -50,7 +35,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: ['/foo', '/bar'],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -63,7 +47,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: ['/xyz', '/asdf'],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -76,7 +59,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'user-id',
-    type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -89,7 +71,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'user-id',
-    type: LibraryType.EXTERNAL,
     importPaths: ['/xyz', '/asdf'],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -102,7 +83,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'user-id',
-    type: LibraryType.EXTERNAL,
     importPaths: [join(THUMBNAIL_DIR, 'library'), '/xyz', join(APP_MEDIA_LOCATION, 'library')],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
diff --git a/server/test/fixtures/shared-link.stub.ts b/server/test/fixtures/shared-link.stub.ts
index d83bd4909..ebadc63fa 100644
--- a/server/test/fixtures/shared-link.stub.ts
+++ b/server/test/fixtures/shared-link.stub.ts
@@ -9,7 +9,6 @@ import { SharedLinkEntity, SharedLinkType } from 'src/entities/shared-link.entit
 import { UserEntity } from 'src/entities/user.entity';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
-import { libraryStub } from 'test/fixtures/library.stub';
 import { userStub } from 'test/fixtures/user.stub';
 
 const today = new Date();
@@ -210,8 +209,6 @@ export const sharedLinkStub = {
           isArchived: false,
           isExternal: false,
           isOffline: false,
-          libraryId: 'library-id',
-          library: libraryStub.uploadLibrary1,
           smartInfo: {
             assetId: 'id_1',
             tags: [],
diff --git a/server/test/repositories/access.repository.mock.ts b/server/test/repositories/access.repository.mock.ts
index 21d298599..8d69e35c0 100644
--- a/server/test/repositories/access.repository.mock.ts
+++ b/server/test/repositories/access.repository.mock.ts
@@ -7,7 +7,6 @@ export interface IAccessRepositoryMock {
   asset: Mocked<IAccessRepository['asset']>;
   album: Mocked<IAccessRepository['album']>;
   authDevice: Mocked<IAccessRepository['authDevice']>;
-  library: Mocked<IAccessRepository['library']>;
   timeline: Mocked<IAccessRepository['timeline']>;
   memory: Mocked<IAccessRepository['memory']>;
   person: Mocked<IAccessRepository['person']>;
@@ -43,10 +42,6 @@ export const newAccessRepositoryMock = (reset = true): IAccessRepositoryMock =>
       checkOwnerAccess: vitest.fn().mockResolvedValue(new Set()),
     },
 
-    library: {
-      checkOwnerAccess: vitest.fn().mockResolvedValue(new Set()),
-    },
-
     timeline: {
       checkPartnerAccess: vitest.fn().mockResolvedValue(new Set()),
     },
diff --git a/server/test/repositories/library.repository.mock.ts b/server/test/repositories/library.repository.mock.ts
index 428061986..6f6100d93 100644
--- a/server/test/repositories/library.repository.mock.ts
+++ b/server/test/repositories/library.repository.mock.ts
@@ -10,8 +10,6 @@ export const newLibraryRepositoryMock = (): Mocked<ILibraryRepository> => {
     softDelete: vitest.fn(),
     update: vitest.fn(),
     getStatistics: vitest.fn(),
-    getDefaultUploadLibrary: vitest.fn(),
-    getUploadLibraryCount: vitest.fn(),
     getAssetIds: vitest.fn(),
     getAllDeleted: vitest.fn(),
     getAll: vitest.fn(),
diff --git a/web/src/lib/components/forms/library-scan-settings-form.svelte b/web/src/lib/components/forms/library-scan-settings-form.svelte
index 3896d7df7..244d99bf3 100644
--- a/web/src/lib/components/forms/library-scan-settings-form.svelte
+++ b/web/src/lib/components/forms/library-scan-settings-form.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { LibraryType, type LibraryResponseDto } from '@immich/sdk';
+  import { type LibraryResponseDto } from '@immich/sdk';
   import { mdiPencilOutline } from '@mdi/js';
   import { createEventDispatcher, onMount } from 'svelte';
   import { handleError } from '../../utils/handle-error';
@@ -27,14 +27,14 @@
 
   const dispatch = createEventDispatcher<{
     cancel: void;
-    submit: { library: Partial<LibraryResponseDto>; type: LibraryType };
+    submit: Partial<LibraryResponseDto>;
   }>();
   const handleCancel = () => {
     dispatch('cancel');
   };
 
   const handleSubmit = () => {
-    dispatch('submit', { library, type: LibraryType.External });
+    dispatch('submit', library);
   };
 
   const handleAddExclusionPattern = () => {
diff --git a/web/src/routes/admin/library-management/+page.svelte b/web/src/routes/admin/library-management/+page.svelte
index a080474ea..8fdbd60d5 100644
--- a/web/src/routes/admin/library-management/+page.svelte
+++ b/web/src/routes/admin/library-management/+page.svelte
@@ -24,7 +24,6 @@
     getAllLibraries,
     getLibraryStatistics,
     getUserById,
-    LibraryType,
     removeOfflineFiles,
     scanLibrary,
     updateLibrary,
@@ -32,7 +31,7 @@
     type LibraryStatsResponseDto,
     type UserResponseDto,
   } from '@immich/sdk';
-  import { mdiDatabase, mdiDotsVertical, mdiPlusBoxOutline, mdiSync, mdiUpload } from '@mdi/js';
+  import { mdiDatabase, mdiDotsVertical, mdiPlusBoxOutline, mdiSync } from '@mdi/js';
   import { onMount } from 'svelte';
   import { fade, slide } from 'svelte/transition';
   import LinkButton from '../../../lib/components/elements/buttons/link-button.svelte';
@@ -108,7 +107,7 @@
   };
 
   async function readLibraryList() {
-    libraries = await getAllLibraries({ $type: LibraryType.External });
+    libraries = await getAllLibraries();
     dropdownOpen.length = libraries.length;
 
     for (let index = 0; index < libraries.length; index++) {
@@ -119,10 +118,7 @@
 
   const handleCreate = async (ownerId: string) => {
     try {
-      const createdLibrary = await createLibrary({
-        createLibraryDto: { ownerId, type: LibraryType.External },
-      });
-
+      const createdLibrary = await createLibrary({ createLibraryDto: { ownerId } });
       notificationController.show({
         message: `Created library: ${createdLibrary.name}`,
         type: NotificationType.Info,
@@ -135,14 +131,14 @@
     }
   };
 
-  const handleUpdate = async (event: Partial<LibraryResponseDto>) => {
+  const handleUpdate = async (library: Partial<LibraryResponseDto>) => {
     if (updateLibraryIndex === null) {
       return;
     }
 
     try {
       const libraryId = libraries[updateLibraryIndex].id;
-      await updateLibrary({ id: libraryId, updateLibraryDto: { ...event } });
+      await updateLibrary({ id: libraryId, updateLibraryDto: library });
       closeAll();
       await readLibraryList();
     } catch (error) {
@@ -177,9 +173,7 @@
   const handleScanAll = async () => {
     try {
       for (const library of libraries) {
-        if (library.type === LibraryType.External) {
-          await scanLibrary({ id: library.id, scanLibraryDto: {} });
-        }
+        await scanLibrary({ id: library.id, scanLibraryDto: {} });
       }
       notificationController.show({
         message: `Refreshing all libraries`,
@@ -361,12 +355,8 @@
                 }`}
               >
                 <td class=" px-10 text-sm">
-                  {#if library.type === LibraryType.External}
-                    <Icon path={mdiDatabase} size="40" title="External library (created on {library.createdAt})" />
-                  {:else if library.type === LibraryType.Upload}
-                    <Icon path={mdiUpload} size="40" title="Upload library (created on {library.createdAt})" />
-                  {/if}</td
-                >
+                  <Icon path={mdiDatabase} size="40" title="External library (created on {library.createdAt})" />
+                </td>
 
                 <td class=" text-ellipsis px-4 text-sm">{library.name}</td>
                 <td class=" text-ellipsis px-4 text-sm">
@@ -400,7 +390,7 @@
                       <ContextMenu {...contextMenuPosition} on:outclick={() => onMenuExit()}>
                         <MenuOption on:click={() => onRenameClicked()} text={`Rename`} />
 
-                        {#if selectedLibrary && selectedLibrary.type === LibraryType.External}
+                        {#if selectedLibrary}
                           <MenuOption on:click={() => onEditImportPathClicked()} text="Edit Import Paths" />
                           <MenuOption on:click={() => onScanSettingClicked()} text="Scan Settings" />
                           <hr />
@@ -448,7 +438,7 @@
                 <div transition:slide={{ duration: 250 }} class="mb-4 ml-4 mr-4">
                   <LibraryScanSettingsForm
                     {library}
-                    on:submit={({ detail }) => handleUpdate(detail.library)}
+                    on:submit={({ detail: library }) => handleUpdate(library)}
                     on:cancel={() => (editScanSettings = null)}
                   />
                 </div>
diff --git a/web/src/routes/admin/repair/+page.svelte b/web/src/routes/admin/repair/+page.svelte
index 14430a099..fc98bcabc 100644
--- a/web/src/routes/admin/repair/+page.svelte
+++ b/web/src/routes/admin/repair/+page.svelte
@@ -250,7 +250,7 @@
                   <div class="px-3">
                     <p>OFFLINE PATHS {orphans.length > 0 ? `(${orphans.length})` : ''}</p>
                     <p class="text-gray-600 dark:text-gray-300 mt-1">
-                      These results may be due to manual deletion of files in the default upload library
+                      These results may be due to manual deletion of files that are not part of an external library.
                     </p>
                   </div>
                 </th>