diff --git a/email-worker/src/lib/emailSenders.ts b/email-worker/src/lib/emailSenders.ts
index 22eb70d..583d5fb 100644
--- a/email-worker/src/lib/emailSenders.ts
+++ b/email-worker/src/lib/emailSenders.ts
@@ -69,8 +69,8 @@ export async function sendVerificationRequests(db: Db, budget: number): Promise<
 
         // Update location status
         const newStatus = success ? EmailStatus.VerificationPending : EmailStatus.VerificationFailed;
-        await db.collection('lokacije').updateOne(
-            { _id: new ObjectId(location._id as any) },
+        await db.collection<BillingLocation>('lokacije').updateOne(
+            { _id: location._id },
             { $set: { tenantEmailStatus: newStatus } }
         );
 
@@ -171,8 +171,8 @@ export async function sendRentDueNotifications(db: Db, budget: number): Promise<
 
         // Update location status
         const newStatus = success ? 'sent' : 'failed';
-        await db.collection('lokacije').updateOne(
-            { _id: new ObjectId(location._id as any) },
+        await db.collection<BillingLocation>('lokacije').updateOne(
+            { _id: location._id },
             { $set: { rentDueNotificationStatus: newStatus } }
         );
 
@@ -264,8 +264,8 @@ export async function sendUtilityBillsNotifications(db: Db, budget: number): Pro
 
         // Update location status
         const newStatus = success ? 'sent' : 'failed';
-        await db.collection('lokacije').updateOne(
-            { _id: new ObjectId(location._id as any) },
+        await db.collection<BillingLocation>('lokacije').updateOne(
+            { _id: location._id },
             { $set: { billFwdStatus: newStatus } }
         );