diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index 1726a0632d718e7921d24b4ec3ec7c5d68d7a37b..097cbada55f6933a6fbdb09da029e07c6b14d0c2 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -210,7 +210,8 @@ class OhmPi(object):
                 last_measurement.update(idic)
                 last_measurement.update(udic)
                 last_measurement.update(tdic)
-            last_measurement.pop('full_waveform')
+
+        last_measurement.pop('full_waveform')
         
         if os.path.isfile(filename):
             # Load data file and append data to it