diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 54914f4b23..bb5b4a6cea 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -57,15 +57,13 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 
         private void updateRelativeChildSize()
         {
-            // the track may not be loaded completely (only has a length once it is).
-            if (!beatmap.Value.Track.IsLoaded)
-            {
-                content.RelativeChildSize = Vector2.One;
-                Schedule(updateRelativeChildSize);
-                return;
-            }
+            // If the track is not loaded, assign a default sane length otherwise relative positioning becomes meaningless.
+            double trackLength = beatmap.Value.Track.IsLoaded ? beatmap.Value.Track.Length : 60000;
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, trackLength), 1);
 
-            content.RelativeChildSize = new Vector2((float)Math.Max(1, beatmap.Value.Track.Length), 1);
+            // The track may not be loaded completely (only has a length once it is).
+            if (!beatmap.Value.Track.IsLoaded)
+                Schedule(updateRelativeChildSize);
         }
 
         protected virtual void LoadBeatmap(EditorBeatmap beatmap)
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 6485f683ad..81d82130da 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly Bindable<Track> track = new Bindable<Track>();
 
-        public double TrackLength => track.Value?.Length ?? 60000;
+        public double TrackLength => track.Value?.IsLoaded == true ? track.Value.Length : 60000;
 
         public ControlPointInfo ControlPointInfo => Beatmap.ControlPointInfo;