diff --git a/src/lib/db/client-instance-store.ts b/src/lib/db/client-instance-store.ts
index cc4d767259..d326c705db 100644
--- a/src/lib/db/client-instance-store.ts
+++ b/src/lib/db/client-instance-store.ts
@@ -74,16 +74,12 @@ export default class ClientInstanceStore implements IClientInstanceStore {
     async bulkUpsert(instances: INewClientInstance[]): Promise<void> {
         const stopTimer = this.metricTimer('bulkUpsert');
 
-        const rows = instances.map((i) =>
-            Object.fromEntries(
-                Object.entries(mapToDb(i)).filter(([, v]) => v !== undefined),
-            ),
-        );
+        const rows = instances.map(mapToDb);
 
         await this.db(TABLE)
             .insert(rows)
             .onConflict(['app_name', 'instance_id', 'environment'])
-            .merge();
+            .merge(['last_seen', 'client_ip']);
 
         stopTimer();
     }