diff --git a/src/asynStreamGeneratorDriver.cpp b/src/asynStreamGeneratorDriver.cpp
index f0f7207..bda3e18 100644
--- a/src/asynStreamGeneratorDriver.cpp
+++ b/src/asynStreamGeneratorDriver.cpp
@@ -752,7 +752,8 @@ void asynStreamGeneratorDriver::processEvents() {
                 // same final timestamp
                 if ((countPreset && counts[presetChannel] >= countPreset) ||
                     (timePreset && elapsedSeconds > (double)timePreset)) {
-                    elapsedSeconds = timePreset;
+                    elapsedSeconds =
+                        timePreset == 0 ? elapsedSeconds : timePreset;
                     break;
                 }