diff --git a/Desktop_Interface/isodriver.cpp b/Desktop_Interface/isodriver.cpp
index b0100a4d..014be713 100644
--- a/Desktop_Interface/isodriver.cpp
+++ b/Desktop_Interface/isodriver.cpp
@@ -682,12 +682,7 @@ int isoDriver::trigger(void){
             }
         }
     }
-
-    if(singleShotEnabled && (location != -1)) {
-        delay = triggerDelay;
-        delayUpdated(delay);
-        singleShotTriggered(1);
-    }
+    
     return location;
 }
 
@@ -797,6 +792,9 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)  //0 for off, 1
         }
     }
 
+    if(singleShotEnabled && (triggerDelay != 0))
+        singleShotTriggered(1);
+
     readData375_CH1 = internalBuffer375_CH1->readBuffer(window,GRAPH_SAMPLES,CH1_mode==2, delay + (triggerEnabled ? triggerDelay + window/2 : 0));
     if(CH2_mode) readData375_CH2 = internalBuffer375_CH2->readBuffer(window,GRAPH_SAMPLES,CH2_mode==2, delay + (triggerEnabled ? triggerDelay + window/2 : 0));
     if(CH1_mode == -1) readData750 = internalBuffer750->readBuffer(window,GRAPH_SAMPLES,false, delay + (triggerEnabled ? triggerDelay + window/2 : 0));