diff --git a/src/infra/machine-name.test.ts b/src/infra/machine-name.test.ts
index f36efd6ceee..f95355a92e0 100644
--- a/src/infra/machine-name.test.ts
+++ b/src/infra/machine-name.test.ts
@@ -34,12 +34,12 @@ afterEach(() => {
 });
 
 describe("getMachineDisplayName", () => {
-  it("uses the hostname fallback in test mode and trims .local", async () => {
-    const hostnameSpy = vi.spyOn(os, "hostname").mockReturnValue("  clawbox.local  ");
+  it("uses the hostname fallback in test mode and strips a trimmed .local suffix", async () => {
+    const hostnameSpy = vi.spyOn(os, "hostname").mockReturnValue("  clawbox.LOCAL  ");
     const machineName = await importMachineName("test-fallback");
 
-    await expect(machineName.getMachineDisplayName()).resolves.toBe("clawbox.local");
-    await expect(machineName.getMachineDisplayName()).resolves.toBe("clawbox.local");
+    await expect(machineName.getMachineDisplayName()).resolves.toBe("clawbox");
+    await expect(machineName.getMachineDisplayName()).resolves.toBe("clawbox");
     expect(hostnameSpy).toHaveBeenCalledTimes(1);
     expect(execFileMock).not.toHaveBeenCalled();
   });
diff --git a/src/infra/machine-name.ts b/src/infra/machine-name.ts
index 4d31be7f234..51b4a66e8bd 100644
--- a/src/infra/machine-name.ts
+++ b/src/infra/machine-name.ts
@@ -20,12 +20,8 @@ async function tryScutil(key: "ComputerName" | "LocalHostName") {
 }
 
 function fallbackHostName() {
-  return (
-    os
-      .hostname()
-      .replace(/\.local$/i, "")
-      .trim() || "openclaw"
-  );
+  const trimmed = os.hostname().trim();
+  return trimmed.replace(/\.local$/i, "") || "openclaw";
 }
 
 export async function getMachineDisplayName(): Promise<string> {