diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index 589a62ee48..43dd47e239 100644
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -103,6 +103,17 @@ ges_timeline_dispose (GObject * object)
     g_object_unref (timeline->discoverer);
     timeline->discoverer = NULL;
   }
+
+  while (timeline->tracks) {
+    TrackPrivate *priv = (TrackPrivate *) timeline->tracks->data;
+    ges_timeline_remove_track (timeline, priv->track);
+  }
+
+  while (timeline->layers) {
+    GESTimelineLayer *layer = (GESTimelineLayer *) timeline->layers->data;
+    ges_timeline_remove_layer (timeline, layer);
+  }
+
   G_OBJECT_CLASS (ges_timeline_parent_class)->dispose (object);
 }