diff --git a/server/src/queries/activity.repository.sql b/server/src/queries/activity.repository.sql
index 9ce1ec46ee..5f25a7dcbd 100644
--- a/server/src/queries/activity.repository.sql
+++ b/server/src/queries/activity.repository.sql
@@ -31,11 +31,11 @@ select
   count(*) as "count"
 from
   "activity"
-  left join "users" on "users"."id" = "activity"."userId"
+  inner join "users" on "users"."id" = "activity"."userId"
+  and "users"."deletedAt" is null
   left join "assets" on "assets"."id" = "activity"."assetId"
 where
   "activity"."assetId" = $1
   and "activity"."albumId" = $2
   and "activity"."isLiked" = $3
-  and "users"."deletedAt" is null
   and "assets"."deletedAt" is null
diff --git a/server/src/repositories/activity.repository.ts b/server/src/repositories/activity.repository.ts
index c7bff91978..6ed82abdfc 100644
--- a/server/src/repositories/activity.repository.ts
+++ b/server/src/repositories/activity.repository.ts
@@ -60,12 +60,11 @@ export class ActivityRepository implements IActivityRepository {
     const { count } = await this.db
       .selectFrom('activity')
       .select((eb) => eb.fn.countAll().as('count'))
-      .leftJoin('users', 'users.id', 'activity.userId')
+      .innerJoin('users', (join) => join.onRef('users.id', '=', 'activity.userId').on('users.deletedAt', 'is', null))
       .leftJoin('assets', 'assets.id', 'activity.assetId')
       .$if(!!assetId, (qb) => qb.where('activity.assetId', '=', assetId!))
       .where('activity.albumId', '=', albumId)
       .where('activity.isLiked', '=', false)
-      .where('users.deletedAt', 'is', null)
       .where('assets.deletedAt', 'is', null)
       .executeTakeFirstOrThrow();