diff --git a/pulse_lib/keysight/M3202A_uploader.py b/pulse_lib/keysight/M3202A_uploader.py
index 66246594c45bbffc504625602c6b1d2691d20739..42773bbd542628a96049492138c57461a24f2e3a 100644
--- a/pulse_lib/keysight/M3202A_uploader.py
+++ b/pulse_lib/keysight/M3202A_uploader.py
@@ -976,17 +976,16 @@ class UploadAggregator:
                     if rf_source is not None and rf_source.mode != 'continuous':
                         rf_marker_pulses.append(RfMarkerPulse(t, t_end))
 
-            if (rf_source is not None
-                and rf_source.mode == 'continuous'
-                and t_end is not None):
+            if rf_source is not None:
+                if rf_source.mode == 'continuous' and t_end is not None:
                     rf_marker_pulses.append(RfMarkerPulse(0, t_end))
 
-            for rf_pulse in rf_marker_pulses:
-                rf_pulse.start += rf_source.delay
-                rf_pulse.stop += rf_source.delay
-                if rf_source.mode in ['pulsed', 'continuous']:
-                    rf_pulse.start -= rf_source.startup_time_ns
-                    rf_pulse.stop += rf_source.prolongation_ns
+                for rf_pulse in rf_marker_pulses:
+                    rf_pulse.start += rf_source.delay
+                    rf_pulse.stop += rf_source.delay
+                    if rf_source.mode in ['pulsed', 'continuous']:
+                        rf_pulse.start -= rf_source.startup_time_ns
+                        rf_pulse.stop += rf_source.prolongation_ns
 
         job.digitizer_triggers = list(trigger_channels.keys())
         job.digitizer_triggers.sort()
diff --git a/pulse_lib/keysight/qs_uploader.py b/pulse_lib/keysight/qs_uploader.py
index b2ccd3e95aaea76c6b98028fea3b14fb0a1debfc..dcdb1bbd8d1e75bc598823d2d42cd7088c07b0b3 100644
--- a/pulse_lib/keysight/qs_uploader.py
+++ b/pulse_lib/keysight/qs_uploader.py
@@ -1124,17 +1124,16 @@ class UploadAggregator:
                     if rf_source is not None and rf_source.mode != 'continuous':
                         rf_marker_pulses.append(RfMarkerPulse(t, t_end))
 
-            if (rf_source is not None
-                and rf_source.mode == 'continuous'
-                and t_end is not None):
+            if rf_source is not None:
+                if rf_source.mode == 'continuous' and t_end is not None:
                     rf_marker_pulses.append(RfMarkerPulse(0, t_end))
 
-            for rf_pulse in rf_marker_pulses:
-                rf_pulse.start += rf_source.delay
-                rf_pulse.stop += rf_source.delay
-                if rf_source.mode in ['pulsed', 'continuous']:
-                    rf_pulse.start -= rf_source.startup_time_ns
-                    rf_pulse.stop += rf_source.prolongation_ns
+                for rf_pulse in rf_marker_pulses:
+                    rf_pulse.start += rf_source.delay
+                    rf_pulse.stop += rf_source.delay
+                    if rf_source.mode in ['pulsed', 'continuous']:
+                        rf_pulse.start -= rf_source.startup_time_ns
+                        rf_pulse.stop += rf_source.prolongation_ns
 
             sequence.close()
 
diff --git a/pulse_lib/tektronix/tektronix5014_uploader.py b/pulse_lib/tektronix/tektronix5014_uploader.py
index 7db930c5ac3f9ef560f7003464a34efd0b46cb77..7c9a27013c06054c6f4d6babcd0a916cbc8e7be6 100644
--- a/pulse_lib/tektronix/tektronix5014_uploader.py
+++ b/pulse_lib/tektronix/tektronix5014_uploader.py
@@ -620,17 +620,16 @@ class UploadAggregator:
                     if rf_source is not None and rf_source.mode != 'continuous':
                         rf_marker_pulses.append(RfMarkerPulse(t, t_end))
 
-            if (rf_source is not None
-                and rf_source.mode == 'continuous'
-                and t_end is not None):
+            if rf_source is not None:
+                if rf_source.mode == 'continuous' and t_end is not None:
                     rf_marker_pulses.append(RfMarkerPulse(0, t_end))
 
-            for rf_pulse in rf_marker_pulses:
-                rf_pulse.start += rf_source.delay
-                rf_pulse.stop += rf_source.delay
-                if rf_source.mode in ['pulsed', 'continuous']:
-                    rf_pulse.start -= rf_source.startup_time_ns
-                    rf_pulse.stop += rf_source.prolongation_ns
+                for rf_pulse in rf_marker_pulses:
+                    rf_pulse.start += rf_source.delay
+                    rf_pulse.stop += rf_source.delay
+                    if rf_source.mode in ['pulsed', 'continuous']:
+                        rf_pulse.start -= rf_source.startup_time_ns
+                        rf_pulse.stop += rf_source.prolongation_ns
 
         job.digitizer_triggers = list(triggers)
         job.digitizer_triggers.sort()