diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 812b20d447..e66221514c 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -91,7 +91,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
             // emulate non-legacy control points by cloning the non-legacy portion.
             // the assertion is that the encoder can recreate this losslessly from hitobject data.
-            decoded.beatmap.ControlPointInfo = decoded.beatmap.ControlPointInfo.DeepClone();
+            var controlPointInfo = new ControlPointInfo();
+
+            foreach (var point in decoded.beatmap.ControlPointInfo.AllControlPoints)
+                controlPointInfo.Add(point.Time, point.DeepClone());
+
+            decoded.beatmap.ControlPointInfo = controlPointInfo;
 
             Assert.AreNotEqual(typeof(LegacyControlPointInfo), decoded.beatmap.ControlPointInfo.GetType());
 
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index d2a3b2fc8b..3ff40fe194 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -324,7 +324,7 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public ControlPointInfo DeepClone()
         {
-            var controlPointInfo = new ControlPointInfo();
+            var controlPointInfo = (ControlPointInfo)Activator.CreateInstance(GetType());
 
             foreach (var point in AllControlPoints)
                 controlPointInfo.Add(point.Time, point.DeepClone());