diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index 9778ba723..579323d64 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -29,7 +29,7 @@ LEFT JOIN
 WHERE
 	rae.deleted_at IS NULL
 	AND rae.visibility = 0 -- timeline visibility
-	AND rae.owner_id in ?
+	AND rae.owner_id IN :user_ids
 	AND (
 		rae.stack_id IS NULL
 		OR rae.id = se.primary_asset_id
@@ -57,7 +57,7 @@ SELECT
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (
-	SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum
+	SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN :user_ids
 )
 AND EXISTS (
 	SELECT 1 FROM local_album_asset_entity laa
@@ -85,7 +85,7 @@ FROM
 	WHERE
 		rae.deleted_at IS NULL
 		AND rae.visibility = 0 -- timeline visibility
-		AND rae.owner_id in ?
+		AND rae.owner_id in :user_ids
 		AND (
 			rae.stack_id IS NULL
 			OR rae.id = se.primary_asset_id
@@ -103,6 +103,7 @@ FROM
 		local_album_entity la ON la.id = laa.album_id
 	WHERE
 		rae.id IS NULL
+		AND rae.owner_id IN :user_ids
 		AND la.backup_selection = 0 -- selected
 )
 GROUP BY bucket_date
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index 75f8de2de..9916ec13b 100644
Binary files a/mobile/lib/infrastructure/entities/merged_asset.drift.dart and b/mobile/lib/infrastructure/entities/merged_asset.drift.dart differ
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index a2c14a363..dcd10faa6 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -41,7 +41,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     }
 
     return _db.mergedAssetDrift
-        .mergedBucket(userIds, groupBy: groupBy.index)
+        .mergedBucket(userIds: userIds, groupBy: groupBy.index)
         .map((row) {
           final date = row.bucketDate.dateFmt(groupBy);
           return TimeBucket(date: date, assetCount: row.assetCount);
@@ -52,7 +52,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
   Future<List<BaseAsset>> _getMainBucketAssets(List<String> userIds, {required int offset, required int count}) {
     return _db.mergedAssetDrift
-        .mergedAsset(userIds, limit: (_) => Limit(count, offset))
+        .mergedAsset(userIds: userIds, limit: (_) => Limit(count, offset))
         .map(
           (row) => row.remoteId != null && row.ownerId != null
               ? RemoteAsset(