diff --git a/src/components/pulses/composite_pulses.jl b/src/components/pulses/composite_pulses.jl
index 91e28b3d3a8edc36eed371205a6ea6a44858a2d7..4738bcd22064f8986b951750e2944b5f16a40a4d 100644
--- a/src/components/pulses/composite_pulses.jl
+++ b/src/components/pulses/composite_pulses.jl
@@ -111,13 +111,13 @@ function make_generic(comp::CompositePulse)
         start_time = t1 + (index - 1) * comp.pulse_time - duration(comp.pulses[index]) / 2
         push!(times, start_time)
         push!(amplitude, 0.)
-        push!(phase, NaN)
+        push!(phase, generic.phase[1])
         append!(times, start_time .+ generic.time)
         append!(amplitude, generic.amplitude)
         append!(phase, generic.phase)
         push!(times, times[end])
         push!(amplitude, 0.)
-        push!(phase, NaN)
+        push!(phase, generic.phase[end])
     end
     return GenericPulse(times, amplitude, phase)
 end