diff --git a/gamutrf/grscan.py b/gamutrf/grscan.py
index 9ed9b5c6..80198081 100644
--- a/gamutrf/grscan.py
+++ b/gamutrf/grscan.py
@@ -92,6 +92,7 @@ def __init__(
         use_external_heading=False,
         vkfft=False,
         wavelearner=None,
+        write_fft_points=False,
         write_samples=0,
     ):
         gr.top_block.__init__(self, "scan", catch_exceptions=True)
@@ -186,7 +187,8 @@ def __init__(
         self.samples_blocks = []
         self.write_samples_block = None
         if write_samples:
-            fft_dir = sample_dir
+            if write_fft_points:
+                fft_dir = sample_dir
             Path(sample_dir).mkdir(parents=True, exist_ok=True)
             self.samples_blocks.extend(
                 [
diff --git a/gamutrf/scan.py b/gamutrf/scan.py
index d18030ad..921984ac 100644
--- a/gamutrf/scan.py
+++ b/gamutrf/scan.py
@@ -118,7 +118,14 @@ def argument_parser():
         dest="write_samples",
         default=0,
         type=int,
-        help="if > 0, write FFT/raw samples to --sample_dir",
+        help="if > 0, write FFT points/raw samples to --sample_dir",
+    )
+    parser.add_argument(
+        "--write_fft_points",
+        dest="write_fft_points",
+        default=False,
+        action=BooleanOptionalAction,
+        help="Write FFT points to --sample_dir if write_samples > 0",
     )
     parser.add_argument(
         "--nfft",