diff --git a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
index 6d296edd1..c48875f4c 100644
--- a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
+++ b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
@@ -3,6 +3,7 @@ import { Button, Form, InputNumber, Popover, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+
 export default function CABCpvrtCalculator({ disabled, form }) {
   const [visibility, setVisibility] = useState(false);
 
@@ -39,7 +40,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
   );
 
   return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
       <Button disabled={disabled} onClick={() => setVisibility(true)}>
         <CalculatorFilled />
       </Button>
diff --git a/client/src/components/chat-affix/registerMessagingSocketHandlers.js b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
index f2d9d1ef9..6c6e96ad2 100644
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -202,8 +202,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {
                       text: message.text
                     };
 
-                  // Add cases for other known message types as needed
-
                   default:
                     // Log a warning for unhandled message types
                     logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
@@ -211,7 +209,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
                 }
               }
 
-              return messageRef; // Keep other messages unchanged
+              return messageRef;
             });
           }
         }
@@ -245,11 +243,8 @@ export const registerMessagingHandlers = ({ socket, client }) => {
         });
 
         const updatedList = existingList?.conversations
-          ? [
-              newConversation,
-              ...existingList.conversations.filter((conv) => conv.id !== newConversation.id) // Prevent duplicates
-            ]
-          : [newConversation];
+          ? [newConversation, ...existingList.conversations.filter((conv) => conv.id !== newConversation.id)]
+          : [newConversation]; // Prevent duplicates
 
         client.cache.writeQuery({
           query: CONVERSATION_LIST_QUERY,
@@ -403,6 +398,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
           }
 
           break;
+
         default:
           logLocal("handleConversationChanged - Unhandled type", { type });
           client.cache.modify({
@@ -419,10 +415,95 @@ export const registerMessagingHandlers = ({ socket, client }) => {
     }
   };
 
+  // Existing handler for phone number opt-out
+  const handlePhoneNumberOptedOut = async (data) => {
+    const { bodyshopid, phone_number } = data;
+    logLocal("handlePhoneNumberOptedOut - Start", data);
+
+    try {
+      client.cache.modify({
+        id: "ROOT_QUERY",
+        fields: {
+          phone_number_opt_out(existing = [], { readField }) {
+            const phoneNumberExists = existing.some(
+              (ref) => readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid
+            );
+
+            if (phoneNumberExists) {
+              logLocal("handlePhoneNumberOptedOut - Phone number already in cache", { phone_number, bodyshopid });
+              return existing;
+            }
+
+            const newOptOut = {
+              __typename: "phone_number_opt_out",
+              id: `temporary-${phone_number}-${Date.now()}`,
+              bodyshopid,
+              phone_number,
+              created_at: new Date().toISOString(),
+              updated_at: new Date().toISOString()
+            };
+
+            return [...existing, newOptOut];
+          }
+        },
+        broadcast: true
+      });
+
+      client.cache.evict({
+        id: "ROOT_QUERY",
+        fieldName: "phone_number_opt_out",
+        args: { bodyshopid, search: phone_number }
+      });
+      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedOut - Cache updated successfully", data);
+    } catch (error) {
+      console.error("Error updating cache for phone number opt-out:", error);
+      logLocal("handlePhoneNumberOptedOut - Error", { error: error.message });
+    }
+  };
+
+  // New handler for phone number opt-in
+  const handlePhoneNumberOptedIn = async (data) => {
+    const { bodyshopid, phone_number } = data;
+    logLocal("handlePhoneNumberOptedIn - Start", data);
+
+    try {
+      // Update the Apollo cache for GET_PHONE_NUMBER_OPT_OUTS by removing the phone number
+      client.cache.modify({
+        id: "ROOT_QUERY",
+        fields: {
+          phone_number_opt_out(existing = [], { readField }) {
+            // Filter out the phone number from the opt-out list
+            return existing.filter(
+              (ref) => !(readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid)
+            );
+          }
+        },
+        broadcast: true // Trigger UI updates
+      });
+
+      // Evict the cache entry to force a refetch on next query
+      client.cache.evict({
+        id: "ROOT_QUERY",
+        fieldName: "phone_number_opt_out",
+        args: { bodyshopid, search: phone_number }
+      });
+      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedIn - Cache updated successfully", data);
+    } catch (error) {
+      console.error("Error updating cache for phone number opt-in:", error);
+      logLocal("handlePhoneNumberOptedIn - Error", { error: error.message });
+    }
+  };
+
   socket.on("new-message-summary", handleNewMessageSummary);
   socket.on("new-message-detailed", handleNewMessageDetailed);
   socket.on("message-changed", handleMessageChanged);
   socket.on("conversation-changed", handleConversationChanged);
+  socket.on("phone-number-opted-out", handlePhoneNumberOptedOut);
+  socket.on("phone-number-opted-in", handlePhoneNumberOptedIn);
 };
 
 export const unregisterMessagingHandlers = ({ socket }) => {
@@ -431,4 +512,6 @@ export const unregisterMessagingHandlers = ({ socket }) => {
   socket.off("new-message-detailed");
   socket.off("message-changed");
   socket.off("conversation-changed");
+  socket.off("phone-number-opted-out");
+  socket.off("phone-number-opted-in");
 };
diff --git a/client/src/components/chat-messages-list/renderMessage.jsx b/client/src/components/chat-messages-list/renderMessage.jsx
index b94e69ee0..c572d77e3 100644
--- a/client/src/components/chat-messages-list/renderMessage.jsx
+++ b/client/src/components/chat-messages-list/renderMessage.jsx
@@ -2,7 +2,7 @@ import Icon from "@ant-design/icons";
 import { Tooltip } from "antd";
 import i18n from "i18next";
 import dayjs from "../../utils/day";
-import { MdDone, MdDoneAll } from "react-icons/md";
+import { MdClose, MdDone, MdDoneAll } from "react-icons/md";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 export const renderMessage = (messages, index) => {
@@ -31,13 +31,16 @@ export const renderMessage = (messages, index) => {
         </Tooltip>
 
         {/* Message status icons */}
-        {message.status && (message.status === "sent" || message.status === "delivered") && (
-          <div className="message-status">
-            <Icon component={message.status === "sent" ? MdDone : MdDoneAll} className="message-icon" />
-          </div>
-        )}
+        {message.status &&
+          (message.status === "sent" || message.status === "delivered" || message.status === "failed") && (
+            <div className="message-status">
+              <Icon
+                component={message.status === "sent" ? MdDone : message.status === "delivered" ? MdDoneAll : MdClose}
+                className="message-icon"
+              />
+            </div>
+          )}
       </div>
-
       {/* Outbound message metadata */}
       {message.isoutbound && (
         <div style={{ fontSize: 10 }}>
diff --git a/client/src/components/chat-send-message/chat-send-message.component.jsx b/client/src/components/chat-send-message/chat-send-message.component.jsx
index 798532a3e..c3e91b2b1 100644
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -1,6 +1,6 @@
 import { LoadingOutlined, SendOutlined } from "@ant-design/icons";
-import { Alert, Input, Spin } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import { Alert, Input, Space, Spin } from "antd";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -68,48 +68,58 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
   };
 
   return (
-    <div className="imex-flex-row" style={{ width: "100%" }}>
-      {isOptedOut && <Alert message={t("messaging.errors.no_consent")} type="warning" style={{ marginBottom: 8 }} />}
-      <ChatPresetsComponent className="imex-flex-row__margin" />
-      <ChatMediaSelector
-        conversation={conversation}
-        selectedMedia={selectedMedia}
-        setSelectedMedia={setSelectedMedia}
-      />
-      <span style={{ flex: 1 }}>
-        <Input.TextArea
-          className="imex-flex-row__margin imex-flex-row__grow"
-          allowClear
-          autoFocus
-          ref={inputArea}
-          autoSize={{ minRows: 1, maxRows: 4 }}
-          value={message}
-          disabled={isSending || isOptedOut}
-          placeholder={t("messaging.labels.typeamessage")}
-          onChange={(e) => setMessage(e.target.value)}
-          onPressEnter={(event) => {
-            event.preventDefault();
-            if (!event.shiftKey && !isOptedOut) handleEnter();
-          }}
-        />
-      </span>
-      <SendOutlined
-        className="chat-send-message-button"
-        disabled={isOptedOut || message === "" || !message}
-        onClick={handleEnter}
-      />
-      <Spin
-        style={{ display: `${isSending ? "" : "none"}` }}
-        indicator={
-          <LoadingOutlined
-            style={{
-              fontSize: 24
+    <Space direction="vertical" style={{ width: "100%" }} size="middle">
+      {isOptedOut && <Alert message={t("messaging.errors.no_consent")} type="error" />}
+      <div className="imex-flex-row" style={{ width: "100%" }}>
+        {!isOptedOut && (
+          <>
+            <ChatPresetsComponent disabled={isSending} className="imex-flex-row__margin" />
+            <ChatMediaSelector
+              disabled={isSending}
+              conversation={conversation}
+              selectedMedia={selectedMedia}
+              setSelectedMedia={setSelectedMedia}
+            />
+          </>
+        )}
+        <span style={{ flex: 1 }}>
+          <Input.TextArea
+            className="imex-flex-row__margin imex-flex-row__grow"
+            allowClear
+            autoFocus
+            ref={inputArea}
+            autoSize={{ minRows: 1, maxRows: 4 }}
+            value={message}
+            disabled={isSending || isOptedOut}
+            placeholder={t("messaging.labels.typeamessage")}
+            onChange={(e) => setMessage(e.target.value)}
+            onPressEnter={(event) => {
+              event.preventDefault();
+              if (!event.shiftKey && !isOptedOut) handleEnter();
             }}
-            spin
           />
-        }
-      />
-    </div>
+        </span>
+        {!isOptedOut && (
+          <SendOutlined
+            className="chat-send-message-button"
+            disabled={isSending || message === "" || !message}
+            onClick={handleEnter}
+          />
+        )}
+
+        <Spin
+          style={{ display: `${isSending ? "" : "none"}` }}
+          indicator={
+            <LoadingOutlined
+              style={{
+                fontSize: 24
+              }}
+              spin
+            />
+          }
+        />
+      </div>
+    </Space>
   );
 }
 
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index d65f78496..826edea54 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -650,7 +650,7 @@ function Header({
           icon: <OneToOneOutlined />,
           label: t("menus.header.remoteassist"),
           children: [
-            ...(InstanceRenderManager({ imex: true, rome: true })
+            ...(InstanceRenderManager({ imex: true, rome: false })
               ? [
                   {
                     key: "rescue",
@@ -662,7 +662,7 @@ function Header({
                 ]
               : []),
             {
-              key: "rescue",
+              key: "rescue-zoho",
               id: "header-rescue-zoho",
               icon: <UsergroupAddOutlined />,
               label: t("menus.header.rescuemezoho"),
diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
index 85e037e86..680428a57 100644
--- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
+++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
@@ -80,7 +80,7 @@ export function JobEmployeeAssignments({
   );
 
   return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
+    <Popover destroyOnHidden content={popContent} open={visibility}>
       <Spin spinning={loading}>
         <DataLabel label={t("jobs.fields.employee_body")}>
           {body ? (
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
index 338e873dd..5f0c3a2dc 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
@@ -72,7 +72,7 @@ export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
       open={open}
       placement="left"
       onOpenChange={handleOpenChange}
-      destroyTooltipOnHide
+      destroyOnHidden
     >
       <SearchOutlined style={{ cursor: "pointer" }} />
     </Popover>
diff --git a/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx b/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx
index d8895803b..7fd2cf2e4 100644
--- a/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx
+++ b/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx
@@ -75,7 +75,7 @@ export function PartsOrderBackorderEta({
   );
 
   return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
       <DateFormatter>{backordered_eta}</DateFormatter>
       {isAlreadyBackordered && <CalendarFilled style={{ cursor: "pointer" }} onClick={handlePopover} />}
       {loading && <Spin />}
diff --git a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
index 26910643c..e38b30ecb 100644
--- a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
+++ b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
@@ -84,7 +84,7 @@ export function PartsOrderLineBackorderButton({ partsOrderStatus, partsLineId, j
   );
 
   return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
       <Button loading={loading} onClick={handlePopover}>
         {isAlreadyBackordered ? t("parts_orders.actions.receive") : t("parts_orders.actions.backordered")}
       </Button>
diff --git a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
index 3e7cdbdcd..e326a455f 100644
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -140,7 +140,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
   if (record[type]) theEmployee = bodyshop.employees.find((e) => e.id === record[type]);
 
   return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
+    <Popover destroyOnHidden content={popContent} open={visibility}>
       <Spin spinning={loading}>
         {record[type] ? (
           <div>
diff --git a/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx b/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx
index c5b174f26..be74b1f99 100644
--- a/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx
+++ b/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx
@@ -107,7 +107,7 @@ export default function TimeTicketCalculatorComponent({
       open={visible}
       onOpenChange={handleOpenChange}
       placement="right"
-      destroyTooltipOnHide
+      destroyOnHidden
     >
       <Button onClick={(e) => e.preventDefault()}>
         <Space>
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index ccaf566c7..f700bb17c 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -2980,4 +2980,59 @@ exports.INSERT_INTEGRATION_LOG = `
       id
     }
   }
-`;
\ No newline at end of file
+`;
+
+exports.INSERT_PHONE_NUMBER_OPT_OUT = `
+  mutation INSERT_PHONE_NUMBER_OPT_OUT($optOutInput: [phone_number_opt_out_insert_input!]!) {
+    insert_phone_number_opt_out(objects: $optOutInput, on_conflict: { constraint: phone_number_consent_bodyshopid_phone_number_key, update_columns: [updated_at] }) {
+      affected_rows
+      returning {
+        id
+        bodyshopid
+        phone_number
+        created_at
+        updated_at
+      }
+    }
+  }
+`;
+
+// Query to check if a phone number is opted out
+exports.CHECK_PHONE_NUMBER_OPT_OUT = `
+  query CHECK_PHONE_NUMBER_OPT_OUT($bodyshopid: uuid!, $phone_number: String!) {
+    phone_number_opt_out(where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _eq: $phone_number } }) {
+      id
+      bodyshopid
+      phone_number
+      created_at
+      updated_at
+    }
+  }
+`;
+
+// Query to check if a phone number is opted out
+exports.CHECK_PHONE_NUMBER_OPT_OUT = `
+  query CHECK_PHONE_NUMBER_OPT_OUT($bodyshopid: uuid!, $phone_number: String!) {
+    phone_number_opt_out(where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _eq: $phone_number } }) {
+      id
+      bodyshopid
+      phone_number
+      created_at
+      updated_at
+    }
+  }
+`;
+
+// Mutation to delete a phone number opt-out record
+exports.DELETE_PHONE_NUMBER_OPT_OUT = `
+  mutation DELETE_PHONE_NUMBER_OPT_OUT($bodyshopid: uuid!, $phone_number: String!) {
+    delete_phone_number_opt_out(where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _eq: $phone_number } }) {
+      affected_rows
+      returning {
+        id
+        bodyshopid
+        phone_number
+      }
+    }
+  }
+`;
diff --git a/server/sms/receive.js b/server/sms/receive.js
index bf5262b25..514d375b4 100644
--- a/server/sms/receive.js
+++ b/server/sms/receive.js
@@ -3,7 +3,10 @@ const {
   FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID,
   UNARCHIVE_CONVERSATION,
   CREATE_CONVERSATION,
-  INSERT_MESSAGE
+  INSERT_MESSAGE,
+  CHECK_PHONE_NUMBER_OPT_OUT,
+  DELETE_PHONE_NUMBER_OPT_OUT,
+  INSERT_PHONE_NUMBER_OPT_OUT
 } = require("../graphql-client/queries");
 const { phone } = require("phone");
 const { admin } = require("../firebase/firebase-handler");
@@ -51,8 +54,81 @@ const receive = async (req, res) => {
     }
 
     const bodyshop = response.bodyshops[0];
+    const normalizedPhone = phone(req.body.From).phoneNumber.replace(/^\+1/, ""); // Normalize phone number (remove +1 for CA numbers)
+    const messageText = (req.body.Body || "").trim().toUpperCase();
 
-    // Step 4: Process conversation
+    // Step 2: Check for opt-in or opt-out keywords
+    const optInKeywords = ["START", "YES", "UNSTOP"];
+    const optOutKeywords = ["STOP", "STOPALL", "UNSUBSCRIBE", "CANCEL", "END", "QUIT"];
+
+    if (optInKeywords.includes(messageText) || optOutKeywords.includes(messageText)) {
+      // Check if the phone number is in phone_number_opt_out
+      const optOutCheck = await client.request(CHECK_PHONE_NUMBER_OPT_OUT, {
+        bodyshopid: bodyshop.id,
+        phone_number: normalizedPhone
+      });
+
+      if (optInKeywords.includes(messageText)) {
+        // Handle opt-in
+        if (optOutCheck.phone_number_opt_out.length > 0) {
+          // Phone number is opted out; delete the record
+          const deleteResponse = await client.request(DELETE_PHONE_NUMBER_OPT_OUT, {
+            bodyshopid: bodyshop.id,
+            phone_number: normalizedPhone
+          });
+
+          logger.log("sms-opt-in-success", "INFO", "api", null, {
+            msid: req.body.SmsMessageSid,
+            bodyshopid: bodyshop.id,
+            phone_number: normalizedPhone,
+            affected_rows: deleteResponse.delete_phone_number_opt_out.affected_rows
+          });
+
+          // Emit WebSocket event to notify clients
+          const broadcastRoom = getBodyshopRoom(bodyshop.id);
+          ioRedis.to(broadcastRoom).emit("phone-number-opted-in", {
+            bodyshopid: bodyshop.id,
+            phone_number: normalizedPhone
+          });
+        }
+      } else if (optOutKeywords.includes(messageText)) {
+        // Handle opt-out
+        if (optOutCheck.phone_number_opt_out.length === 0) {
+          // Phone number is not opted out; insert a new record
+          const now = new Date().toISOString();
+          const optOutInput = {
+            bodyshopid: bodyshop.id,
+            phone_number: normalizedPhone,
+            created_at: now,
+            updated_at: now
+          };
+
+          const insertResponse = await client.request(INSERT_PHONE_NUMBER_OPT_OUT, {
+            optOutInput: [optOutInput]
+          });
+
+          logger.log("sms-opt-out-success", "INFO", "api", null, {
+            msid: req.body.SmsMessageSid,
+            bodyshopid: bodyshop.id,
+            phone_number: normalizedPhone,
+            affected_rows: insertResponse.insert_phone_number_opt_out.affected_rows
+          });
+
+          // Emit WebSocket event to notify clients
+          const broadcastRoom = getBodyshopRoom(bodyshop.id);
+          ioRedis.to(broadcastRoom).emit("phone-number-opted-out", {
+            bodyshopid: bodyshop.id,
+            phone_number: normalizedPhone
+          });
+        }
+      }
+
+      // Respond immediately without processing as a regular message
+      res.status(200).send("");
+      return;
+    }
+
+    // Step 3: Process conversation
     const sortedConversations = bodyshop.conversations.sort((a, b) => new Date(a.created_at) - new Date(b.created_at));
     const existingConversation = sortedConversations.length
       ? sortedConversations[sortedConversations.length - 1]
@@ -90,7 +166,7 @@ const receive = async (req, res) => {
 
     newMessage.conversationid = conversationid;
 
-    // Step 5: Insert the message
+    // Step 4: Insert the message
     const insertresp = await client.request(INSERT_MESSAGE, {
       msg: newMessage,
       conversationid
@@ -103,7 +179,7 @@ const receive = async (req, res) => {
       throw new Error("Conversation data is missing from the response.");
     }
 
-    // Step 6: Notify clients
+    // Step 5: Notify clients
     const conversationRoom = getBodyshopConversationRoom({
       bodyshopId: conversation.bodyshop.id,
       conversationId: conversation.id
@@ -133,7 +209,7 @@ const receive = async (req, res) => {
       summary: false
     });
 
-    // Step 7: Send FCM notification
+    // Step 6: Send FCM notification
     const fcmresp = await admin.messaging().send({
       topic: `${message.conversation.bodyshop.imexshopid}-messaging`,
       notification: {
diff --git a/server/sms/status.js b/server/sms/status.js
index 509c76d6b..3de841bc4 100644
--- a/server/sms/status.js
+++ b/server/sms/status.js
@@ -1,6 +1,12 @@
 const client = require("../graphql-client/graphql-client").client;
-const { UPDATE_MESSAGE_STATUS, MARK_MESSAGES_AS_READ } = require("../graphql-client/queries");
+const {
+  UPDATE_MESSAGE_STATUS,
+  MARK_MESSAGES_AS_READ,
+  INSERT_PHONE_NUMBER_OPT_OUT,
+  FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID
+} = require("../graphql-client/queries");
 const logger = require("../utils/logger");
+const { phone } = require("phone");
 
 /**
  * Handle the status of an SMS message
@@ -9,7 +15,7 @@ const logger = require("../utils/logger");
  * @returns {Promise<*>}
  */
 const status = async (req, res) => {
-  const { SmsSid, SmsStatus } = req.body;
+  const { SmsSid, SmsStatus, ErrorCode, To, MessagingServiceSid } = req.body;
   const {
     ioRedis,
     ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom }
@@ -21,18 +27,76 @@ const status = async (req, res) => {
       return res.status(200).json({ message: "Status 'queued' disregarded." });
     }
 
+    // Handle ErrorCode 21610 (Attempt to send to unsubscribed recipient) first
+    if (ErrorCode === "21610" && To && MessagingServiceSid) {
+      try {
+        // Step 1: Find the bodyshop by MessagingServiceSid
+        const bodyshopResponse = await client.request(FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID, {
+          mssid: MessagingServiceSid,
+          phone: phone(To).phoneNumber // Pass the normalized phone number as required
+        });
+
+        const bodyshop = bodyshopResponse.bodyshops[0];
+        if (!bodyshop) {
+          logger.log("sms-opt-out-error", "ERROR", "api", null, {
+            msid: SmsSid,
+            messagingServiceSid: MessagingServiceSid,
+            to: To,
+            error: "No matching bodyshop found"
+          });
+        } else {
+          // Step 2: Insert into phone_number_opt_out table
+          const now = new Date().toISOString();
+          const optOutInput = {
+            bodyshopid: bodyshop.id,
+            phone_number: phone(To).phoneNumber.replace(/^\+1/, ""), // Normalize phone number (remove +1 for CA numbers)
+            created_at: now,
+            updated_at: now
+          };
+
+          const optOutResponse = await client.request(INSERT_PHONE_NUMBER_OPT_OUT, {
+            optOutInput: [optOutInput]
+          });
+
+          logger.log("sms-opt-out-success", "INFO", null, null, {
+            msid: SmsSid,
+            bodyshopid: bodyshop.id,
+            phone_number: optOutInput.phone_number,
+            affected_rows: optOutResponse.insert_phone_number_opt_out.affected_rows
+          });
+
+          // Store bodyshopid for potential use in WebSocket notification
+          const broadcastRoom = getBodyshopRoom(bodyshop.id);
+          ioRedis.to(broadcastRoom).emit("phone-number-opted-out", {
+            bodyshopid: bodyshop.id,
+            phone_number: optOutInput.phone_number
+            // Note: conversationId is not included yet; will be set after message lookup
+          });
+        }
+      } catch (error) {
+        logger.log("sms-opt-out-error", "ERROR", "api", null, {
+          msid: SmsSid,
+          messagingServiceSid: MessagingServiceSid,
+          to: To,
+          error: error.message,
+          stack: error.stack
+        });
+        // Continue processing to update message status
+      }
+    }
+
     // Update message status in the database
     const response = await client.request(UPDATE_MESSAGE_STATUS, {
       msid: SmsSid,
       fields: { status: SmsStatus }
     });
 
-    const message = response.update_messages.returning[0];
+    const message = response.update_messages?.returning?.[0];
 
     if (message) {
       logger.log("sms-status-update", "DEBUG", "api", null, {
         msid: SmsSid,
-        fields: { status: SmsStatus }
+        status: SmsStatus
       });
 
       // Emit WebSocket event to notify the change in message status
@@ -47,20 +111,20 @@ const status = async (req, res) => {
         type: "status-changed"
       });
     } else {
-      logger.log("sms-status-update-warning", "WARN", "api", null, {
+      logger.log("sms-status-update-warning", "WARN", null, null, {
         msid: SmsSid,
-        fields: { status: SmsStatus },
-        warning: "No message returned from the database update."
+        status: SmsStatus,
+        warning: "No message found in database for update"
       });
     }
 
     res.sendStatus(200);
-  } catch (error) {
+  } catch (err) {
     logger.log("sms-status-update-error", "ERROR", "api", null, {
       msid: SmsSid,
-      fields: { status: SmsStatus },
-      stack: error.stack,
-      message: error.message
+      status: SmsStatus,
+      error: err.message,
+      stack: err.stack
     });
     res.status(500).json({ error: "Failed to update message status." });
   }