diff --git a/Source/Editor/GUI/Timeline/ParticleSystemTimeline.cs b/Source/Editor/GUI/Timeline/ParticleSystemTimeline.cs
index a537c3346..e943e3ebf 100644
--- a/Source/Editor/GUI/Timeline/ParticleSystemTimeline.cs
+++ b/Source/Editor/GUI/Timeline/ParticleSystemTimeline.cs
@@ -94,6 +94,7 @@ namespace FlaxEditor.GUI.Timeline
                         {
                             var track = (ParticleEmitterTrack)timeline.NewTrack(ParticleEmitterTrack.GetArchetype());
                             track.Asset = emitter;
+                            track.TrackMedia.DurationFrames = timeline.DurationFrames;
                             track.Rename(assetItem.ShortName);
                             timeline.AddTrack(track);
                         }