diff --git a/packages/kilo-gateway/src/api/constants.ts b/packages/kilo-gateway/src/api/constants.ts
index ebd0aee136..50b677d5cd 100644
--- a/packages/kilo-gateway/src/api/constants.ts
+++ b/packages/kilo-gateway/src/api/constants.ts
@@ -50,7 +50,6 @@ export const HEADER_TASKID = "X-KILOCODE-TASKID"
 export const HEADER_PROJECTID = "X-KILOCODE-PROJECTID"
 export const HEADER_TESTER = "X-KILOCODE-TESTER"
 export const HEADER_EDITORNAME = "X-KILOCODE-EDITORNAME"
-export const HEADER_MACHINEID = "X-KILOCODE-MACHINEID"
 
 /** Default editor name value */
 export const DEFAULT_EDITOR_NAME = "Kilo CLI"
diff --git a/packages/kilo-gateway/src/headers.ts b/packages/kilo-gateway/src/headers.ts
index 788bbc7dcd..5882cf4a00 100644
--- a/packages/kilo-gateway/src/headers.ts
+++ b/packages/kilo-gateway/src/headers.ts
@@ -4,7 +4,6 @@ import {
   HEADER_PROJECTID,
   HEADER_TESTER,
   HEADER_EDITORNAME,
-  HEADER_MACHINEID,
   USER_AGENT,
   CONTENT_TYPE,
   DEFAULT_EDITOR_NAME,
@@ -21,7 +20,6 @@ export const X_KILOCODE_TASKID = HEADER_TASKID
 export const X_KILOCODE_PROJECTID = HEADER_PROJECTID
 export const X_KILOCODE_TESTER = HEADER_TESTER
 export const X_KILOCODE_EDITORNAME = HEADER_EDITORNAME
-export const X_KILOCODE_MACHINEID = HEADER_MACHINEID
 
 /**
  * Default headers for KiloCode requests
@@ -47,7 +45,6 @@ export function buildKiloHeaders(
   options?: {
     kilocodeOrganizationId?: string
     kilocodeTesterWarningsDisabledUntil?: number
-    machineId?: string
   },
 ): Record<string, string> {
   const headers: Record<string, string> = {
@@ -71,9 +68,5 @@ export function buildKiloHeaders(
     headers[X_KILOCODE_TESTER] = TESTER_SUPPRESS_VALUE
   }
 
-  if (options?.machineId) {
-    headers[X_KILOCODE_MACHINEID] = options.machineId
-  }
-
   return headers
 }
diff --git a/packages/kilo-gateway/src/index.ts b/packages/kilo-gateway/src/index.ts
index 1ffd33e2a4..3b23e57ace 100644
--- a/packages/kilo-gateway/src/index.ts
+++ b/packages/kilo-gateway/src/index.ts
@@ -89,7 +89,6 @@ export {
   HEADER_PROJECTID,
   HEADER_TESTER,
   HEADER_EDITORNAME,
-  HEADER_MACHINEID,
   DEFAULT_EDITOR_NAME,
   ENV_EDITOR_NAME,
   TESTER_SUPPRESS_VALUE,
diff --git a/packages/opencode/src/session/llm.ts b/packages/opencode/src/session/llm.ts
index 24f3108614..fcea393309 100644
--- a/packages/opencode/src/session/llm.ts
+++ b/packages/opencode/src/session/llm.ts
@@ -26,8 +26,7 @@ import { DEFAULT_HEADERS } from "@/kilocode/const" // kilocode_change
 import { Telemetry } from "@kilocode/kilo-telemetry" // kilocode_change
 // kilocode_change start
 import { getKiloProjectId } from "@/kilocode/project-id"
-import { HEADER_PROJECTID, HEADER_MACHINEID } from "@kilocode/kilo-gateway"
-import { Identity } from "@kilocode/kilo-telemetry"
+import { HEADER_PROJECTID } from "@kilocode/kilo-gateway"
 // kilocode_change end
 
 export namespace LLM {
@@ -159,10 +158,9 @@ export namespace LLM {
       },
     )
 
-    // kilocode_change start - resolve project ID and machine ID for kilo provider
-    const isKilo = input.model.api.npm === "@kilocode/kilo-gateway"
-    const kiloProjectId = isKilo ? await getKiloProjectId().catch(() => undefined) : undefined
-    const machineId = isKilo ? await Identity.getMachineId().catch(() => undefined) : undefined
+    // kilocode_change start - resolve project ID for kilo provider
+    const kiloProjectId =
+      input.model.api.npm === "@kilocode/kilo-gateway" ? await getKiloProjectId().catch(() => undefined) : undefined
     // kilocode_change end
 
     const maxOutputTokens =
@@ -239,9 +237,10 @@ export namespace LLM {
         ...(input.model.api.npm === "@kilocode/kilo-gateway" && input.agent.name
           ? { "x-kilocode-mode": input.agent.name.toLowerCase() }
           : {}),
-        // kilocode_change start - add project ID and machine ID headers for kilo provider
-        ...(isKilo && kiloProjectId ? { [HEADER_PROJECTID]: kiloProjectId } : {}),
-        ...(isKilo && machineId ? { [HEADER_MACHINEID]: machineId } : {}),
+        // kilocode_change start - add project ID header for kilo provider
+        ...(input.model.api.npm === "@kilocode/kilo-gateway" && kiloProjectId
+          ? { [HEADER_PROJECTID]: kiloProjectId }
+          : {}),
         // kilocode_change end
         ...input.model.headers,
         ...headers,