diff --git a/Client/udpstreamer/static/app.js b/Client/udpstreamer/static/app.js
index 159215e..7695363 100644
--- a/Client/udpstreamer/static/app.js
+++ b/Client/udpstreamer/static/app.js
@@ -1343,7 +1343,7 @@ function drawTriggerMarker(u, p) {
   ctx.fillText('T', px + 3, bbox.top + 2);
   // Horizontal threshold line — only on plots that contain the trigger signal
   if (p && trig.signal && p.traces.includes(trig.signal)) {
-    // Normalize the raw threshold to this plot's vscale for the trigger signal.
+    // Normalise the calibrated threshold to this plot's vscale for the trigger signal.
     const tvs = p ? sigVScale[p.id + ':' + trig.signal] : null;
     let threshNorm = trig.threshold;
     if (tvs) {
@@ -2405,7 +2405,7 @@ function updatePlotCursorReadouts() {
 }
 
 /* ─── Hover readout ──────────────────────────────────────────────────────── */
-// Un-normalize a plotted value of trace `key` in plot `p` back to raw units.
+// Un-normalize a plotted value of trace `key` in plot `p` back to calibrated units.
 function rawFromNorm(p, key, vNorm) {
   const vs = sigVScale[p.id + ':' + key];
   if (!vs) return vNorm;
@@ -3052,9 +3052,11 @@ async function exportAllCSV() {
   const displayKeys = keys.map(k => {
     const name = k.includes(':') ? k.split(':').slice(1).join(':') : k;
     const u = unitForKey(k);
-    return u ? name + ' [' + u + ']' : name;
+    const h = u ? name + ' [' + u + ']' : name;
+    return '"' + h.replace(/"/g, '""') + '"';
   });
-  const hdr = [(inTrigMode ? 'time_rel_s' : 'time_s'), ...displayKeys].join(',');
+  const timeCol = '"' + (inTrigMode ? 'time_rel_s' : 'time_s') + '"';
+  const hdr = [timeCol, ...displayKeys].join(',');
   const rows = sortedT.map(t =>
     [t.toFixed(9), ...lookups.map((lk, i) =>
       lk.has(t) ? Calib.applyCal(lk.get(t), cals[i]) : '')].join(',')
diff --git a/Client/udpstreamer/static/calibration.js b/Client/udpstreamer/static/calibration.js
index 8756153..1c3c557 100644
--- a/Client/udpstreamer/static/calibration.js
+++ b/Client/udpstreamer/static/calibration.js
@@ -40,9 +40,7 @@
     var offset = obj.offset === undefined ? 0 : obj.offset;
     if (!isFiniteNum(scale) || scale === 0) return null;
     if (!isFiniteNum(offset)) return null;
-    // Commas and quotes would corrupt the CSV export header; drop them here so
-    // every consumer sees an already-safe unit.
-    var unit = String(obj.unit == null ? '' : obj.unit).replace(/[",]/g, '').trim();
+    var unit = String(obj.unit == null ? '' : obj.unit).trim();
     // Cap at MAX_UNIT_LEN UTF-8 bytes, matching both hubs' Normalise() exactly.
     // TextEncoder/TextDecoder are available natively in all modern browsers and
     // Node v11+; no build step or bundler is needed.
diff --git a/Client/udpstreamer/test/calibration.test.js b/Client/udpstreamer/test/calibration.test.js
index c1bed6d..9a108d7 100644
--- a/Client/udpstreamer/test/calibration.test.js
+++ b/Client/udpstreamer/test/calibration.test.js
@@ -150,7 +150,3 @@ test('CalTable.list is sorted by source then signal', () => {
   assert.deepStrictEqual(t.list().map(e => e.source + '/' + e.signal),
                          ['a/b', 'a/z', 'z/a']);
 });
-
-test('normaliseCal strips characters that would corrupt a CSV header', () => {
-  assert.strictEqual(C.normaliseCal({source: 'w', signal: 's', unit: 'k,V"'}).unit, 'kV');
-});