diff --git a/src/all_building_blocks/base_building_blocks.jl b/src/all_building_blocks/base_building_blocks.jl
index 47c440a159e3cac520dd8cf4edd5cfa8a316e2ad..7aa5e808d4288d61bcb29f866039ea978057e3f4 100644
--- a/src/all_building_blocks/base_building_blocks.jl
+++ b/src/all_building_blocks/base_building_blocks.jl
@@ -113,7 +113,7 @@ function waveform_sequence(bb::BaseBuildingBlock, first, last)
     parts = Tuple{Any, GradientWaveform}[]
     for key in keys(bb)
         if bb[key] isa GradientWaveform
-            if started
+            if started && !isnothing(current_grad_key)
                 push!(parts, (current_grad_key, isnothing(current_start) ? bb[current_grad_key] : split_gradient(bb[current_grad_key], current_start)[2]))
             end
             current_grad_key = key