diff --git a/server.js b/server.js
index 2c3d449..10d73c0 100644
--- a/server.js
+++ b/server.js
@@ -394,6 +394,7 @@ app.get("/", (_req, res) => {
         headers: {
           "Authorization": "Bearer " + token,
           "Content-Type": file.type || "image/jpeg",
+          "Accept": "application/json",
         },
         body: file,
       });
@@ -410,30 +411,33 @@ app.get("/", (_req, res) => {
         throw new Error(err.message || "Strip failed");
       }
 
+      const data = await res.json();
+
       // Show removed metadata
-      const metaHeader = res.headers.get("X-Removed-Metadata");
-      if (metaHeader) {
-        try {
-          const meta = JSON.parse(metaHeader);
-          const keys = Object.keys(meta);
-          if (keys.length > 0) {
-            keys.forEach(function(k) {
-              const tr = document.createElement("tr");
-              const td1 = document.createElement("td");
-              td1.textContent = k;
-              const td2 = document.createElement("td");
-              td2.textContent = meta[k];
-              if (meta[k].includes("⚠")) td2.className = "warn";
-              tr.appendChild(td1);
-              tr.appendChild(td2);
-              removedBody.appendChild(tr);
-            });
-            removedDiv.style.display = "";
-          }
-        } catch {}
+      const meta = data.metadata;
+      if (meta) {
+        const keys = Object.keys(meta);
+        if (keys.length > 0) {
+          keys.forEach(function(k) {
+            const tr = document.createElement("tr");
+            const td1 = document.createElement("td");
+            td1.textContent = k;
+            const td2 = document.createElement("td");
+            td2.textContent = meta[k];
+            if (meta[k].includes("⚠")) td2.className = "warn";
+            tr.appendChild(td1);
+            tr.appendChild(td2);
+            removedBody.appendChild(tr);
+          });
+          removedDiv.style.display = "";
+        }
       }
 
-      const blob = await res.blob();
+      // Download clean image
+      const byteString = atob(data.image);
+      const bytes = new Uint8Array(byteString.length);
+      for (let i = 0; i < byteString.length; i++) bytes[i] = byteString.charCodeAt(i);
+      const blob = new Blob([bytes], { type: "image/jpeg" });
       const url = URL.createObjectURL(blob);
       const a = document.createElement("a");
       const name = (file.name || "photo").replace(/\\.[^.]+$/, "") + "_clean.jpg";
@@ -536,11 +540,18 @@ app.post("/strip", async (req, res) => {
       }
 
       if (isAborted(req, res)) return;
+
+      // If client wants JSON, return image + metadata together
+      const wantsJson = String(req.headers["accept"] || "").includes("application/json");
+      if (wantsJson) {
+        res.setHeader("Content-Type", "application/json");
+        return res.json({
+          image: jpeg.toString("base64"),
+          metadata: removed,
+        });
+      }
+
       res.setHeader("Content-Type", "image/jpeg");
-      try {
-        res.setHeader("X-Removed-Metadata", JSON.stringify(removed));
-        res.setHeader("Access-Control-Expose-Headers", "X-Removed-Metadata");
-      } catch {}
       return res.send(jpeg);
     } catch (e) {
       const status = e?.statusCode || 500;