diff --git a/server/src/services/user.service.spec.ts b/server/src/services/user.service.spec.ts
index 847f96cfc6..a00efe82fd 100644
--- a/server/src/services/user.service.spec.ts
+++ b/server/src/services/user.service.spec.ts
@@ -179,7 +179,7 @@ describe(UserService.name, () => {
     it('should throw an error if the user does not exist', async () => {
       mocks.user.get.mockResolvedValue(void 0);
 
-      await expect(sut.getProfileImage(userStub.admin.id)).rejects.toBeInstanceOf(BadRequestException);
+      await expect(sut.getProfileImage(userStub.admin.id)).rejects.toBeInstanceOf(NotFoundException);
 
       expect(mocks.user.get).toHaveBeenCalledWith(userStub.admin.id, {});
     });
diff --git a/server/src/services/user.service.ts b/server/src/services/user.service.ts
index 3627fe1096..906a31106d 100644
--- a/server/src/services/user.service.ts
+++ b/server/src/services/user.service.ts
@@ -134,8 +134,8 @@ export class UserService extends BaseService {
   }
 
   async getProfileImage(id: string): Promise<ImmichFileResponse> {
-    const user = await this.findOrFail(id, {});
-    if (!user.profileImagePath) {
+    const user = await this.userRepository.get(id, {});
+    if (!user || !user.profileImagePath) {
       throw new NotFoundException('Not found');
     }