diff --git a/src/gateway/server.test.ts b/src/gateway/server.test.ts
index bbfa07169..0567f6a62 100644
--- a/src/gateway/server.test.ts
+++ b/src/gateway/server.test.ts
@@ -893,6 +893,70 @@ describe("gateway server", () => {
     await server.close();
   });
 
+  test("chat.send does not overwrite last delivery route", async () => {
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-gw-"));
+    testSessionStorePath = path.join(dir, "sessions.json");
+    await fs.writeFile(
+      testSessionStorePath,
+      JSON.stringify(
+        {
+          main: {
+            sessionId: "sess-main",
+            updatedAt: Date.now(),
+            lastChannel: "whatsapp",
+            lastTo: "+1555",
+          },
+        },
+        null,
+        2,
+      ),
+      "utf-8",
+    );
+
+    const { server, ws } = await startServerWithClient();
+    ws.send(
+      JSON.stringify({
+        type: "hello",
+        minProtocol: 1,
+        maxProtocol: 1,
+        client: { name: "test", version: "1", platform: "test", mode: "test" },
+        caps: [],
+      }),
+    );
+    await onceMessage(ws, (o) => o.type === "hello-ok");
+
+    const reqId = "chat-route";
+    ws.send(
+      JSON.stringify({
+        type: "req",
+        id: reqId,
+        method: "chat.send",
+        params: {
+          sessionKey: "main",
+          message: "hello",
+          idempotencyKey: "idem-route",
+        },
+      }),
+    );
+
+    const res = await onceMessage(
+      ws,
+      (o) => o.type === "res" && o.id === reqId,
+    );
+    expect(res.ok).toBe(true);
+
+    const stored = JSON.parse(
+      await fs.readFile(testSessionStorePath, "utf-8"),
+    ) as {
+      main?: { lastChannel?: string; lastTo?: string };
+    };
+    expect(stored.main?.lastChannel).toBe("whatsapp");
+    expect(stored.main?.lastTo).toBe("+1555");
+
+    ws.close();
+    await server.close();
+  });
+
   test("presence includes client fingerprint", async () => {
     const { server, ws } = await startServerWithClient();
     ws.send(
diff --git a/src/gateway/server.ts b/src/gateway/server.ts
index b8d4867a3..1cfcb6de7 100644
--- a/src/gateway/server.ts
+++ b/src/gateway/server.ts
@@ -868,9 +868,7 @@ export async function startGatewayServer(
                 break;
               }
             }
-            const { cfg, storePath, store, entry } = loadSessionEntry(
-              p.sessionKey,
-            );
+            const { storePath, store, entry } = loadSessionEntry(p.sessionKey);
             const now = Date.now();
             const sessionId = entry?.sessionId ?? randomUUID();
             const sessionEntry: SessionEntry = {
@@ -882,12 +880,6 @@ export async function startGatewayServer(
               lastChannel: entry?.lastChannel,
               lastTo: entry?.lastTo,
             };
-            const mainKey =
-              (cfg.inbound?.reply?.session?.mainKey ?? "main").trim() || "main";
-            if (p.sessionKey === mainKey) {
-              sessionEntry.lastChannel = "webchat";
-              delete sessionEntry.lastTo;
-            }
             if (store) {
               store[p.sessionKey] = sessionEntry;
               if (storePath) {