diff --git a/osu.Game/Beatmaps/Formats/OsuJsonDecoder.cs b/osu.Game/Beatmaps/Formats/OsuJsonDecoder.cs
index ed4b8f3857..d00cbbb8fb 100644
--- a/osu.Game/Beatmaps/Formats/OsuJsonDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/OsuJsonDecoder.cs
@@ -18,8 +18,16 @@ namespace osu.Game.Beatmaps.Formats
             stream.BaseStream.Position = 0;
             stream.DiscardBufferedData();
 
-            string fullText = stream.ReadToEnd();
-            fullText.DeserializeInto(beatmap);
+            try
+            {
+                string fullText = stream.ReadToEnd();
+                fullText.DeserializeInto(beatmap);
+            }
+            catch
+            {
+                // Temporary because storyboards are deserialized into beatmaps at the moment
+                // This try-catch shouldn't exist in the future
+            }
 
             foreach (var hitObject in beatmap.HitObjects)
                 hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.BeatmapInfo.BaseDifficulty);