diff --git a/sfm/server.py b/sfm/server.py
index 22248c5..de42a51 100644
--- a/sfm/server.py
+++ b/sfm/server.py
@@ -885,12 +885,13 @@ def device_event_blastware_file(
         def _do():
             with _build_client(port, baud, host, tcp_port, timeout=120.0) as client:
                 info = client.connect()
-                # Use full_waveform=False (stop_after_metadata=True) — downloads until
-                # "Project:" is found in the 5A stream, which covers the compliance
-                # metadata section.  For simple Continuous/Single-Shot mode events this
-                # produces the correct body content.  Histogram+Continuous mode requires
-                # different handling (TODO: handle multi-mode events).
-                events = client.get_events(full_waveform=False, stop_after_index=index)
+                # Use full_waveform=True (stop_after_metadata=False) — downloads until
+                # the device signals natural end-of-stream.  For simple Continuous /
+                # Single-Shot events this gives byte-identical content to BW.
+                # NOTE: Histogram+Continuous mode produces extra embedded STRT records
+                # (session data from preceding histogram intervals bleeds into the 5A
+                # stream) — handle that mode separately once basic waveform is correct.
+                events = client.get_events(full_waveform=True, stop_after_index=index)
                 matching = [ev for ev in events if ev.index == index]
                 return matching[0] if matching else None, info
         ev, info = _run_with_retry(_do, is_tcp=_is_tcp(host))