diff --git a/src/lib/server/services/gateway.ts b/src/lib/server/services/gateway.ts
index 29c5816..98343fa 100644
--- a/src/lib/server/services/gateway.ts
+++ b/src/lib/server/services/gateway.ts
@@ -175,8 +175,9 @@ export async function proxyToTarget(
 						if (text) agentBody = JSON.parse(text);
 					} catch { /* non-JSON or empty body — use empty object */ }
 				}
-				const mergedBody = JSON.stringify({ ...agentBody, ...storedFields });
-				headers.set("Content-Type", "application/json");
+				const hasBody = request.method !== "GET" && request.method !== "HEAD";
+				const mergedBody = hasBody ? JSON.stringify({ ...agentBody, ...storedFields }) : undefined;
+				if (hasBody) headers.set("Content-Type", "application/json");
 
 				console.log("[gateway] →", request.method, url.toString());
 				console.log("[gateway] → headers:", Object.fromEntries(headers.entries()));
diff --git a/tests/integration/gateway.test.ts b/tests/integration/gateway.test.ts
index 2d8f7d6..715114b 100644
--- a/tests/integration/gateway.test.ts
+++ b/tests/integration/gateway.test.ts
@@ -416,4 +416,27 @@ describe("gateway proxy", () => {
 		const sentBody = await new Response(init!.body).json();
 		expect(sentBody).toEqual({ token: "abc" });
 	});
+
+	it("json_body does not send body on GET requests", async () => {
+		const { token: tokenRow } = await createTestToken();
+		const target = await createTestTarget("JsonGetAPI", "https://api.jsonget.com");
+		const storedBody = JSON.stringify({ secret_id: "abc", secret_key: "xyz" });
+		await createTestAuthMethod(target.id, { type: "json_body", credential: storedBody });
+		await grantPermission(tokenRow.id, target.id);
+
+		const fullToken = await getFullToken(tokenRow.id);
+
+		const fetchSpy = vi.spyOn(globalThis, "fetch").mockResolvedValue(Response.json({ ok: true }));
+
+		const request = new Request(`http://localhost/gateway/${target.slug}/data`, {
+			method: "GET",
+		});
+
+		const response = await proxyRequest(fullToken, target.slug, "data", request);
+
+		expect(response.status).toBe(200);
+		expect(fetchSpy).toHaveBeenCalledOnce();
+		const [, init] = fetchSpy.mock.calls[0];
+		expect(init!.body).toBeUndefined();
+	});
 });