diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js
index 189471e5a..ff20af151 100644
--- a/server/email/tasksEmails.js
+++ b/server/email/tasksEmails.js
@@ -29,10 +29,12 @@ if (process.env.NODE_ENV !== "development") {
   // Handling SIGINT (e.g., Ctrl+C)
   process.on("SIGINT", async () => {
     await tasksEmailQueueCleanup();
+    process.exit(0);
   });
   // Handling SIGTERM (e.g., sent by system shutdown)
   process.on("SIGTERM", async () => {
     await tasksEmailQueueCleanup();
+    process.exit(0);
   });
   // Handling uncaught exceptions
   process.on("uncaughtException", async (err) => {
diff --git a/server/email/tasksEmailsQueue.js b/server/email/tasksEmailsQueue.js
index b01c9aa14..dc004abc1 100644
--- a/server/email/tasksEmailsQueue.js
+++ b/server/email/tasksEmailsQueue.js
@@ -13,7 +13,7 @@ const taskEmailQueue = () =>
       console.log("Processing reminds for taskIds: ", taskIds.join(", "));
 
       // Set the remind_at_sent to the current time.
-      const now = moment.utc().toISOString();
+      const now = moment().toISOString();
 
       client
         .request(UPDATE_TASKS_REMIND_AT_SENT, { taskIds, now })