diff --git a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
index 7e140e6fd2..51508a5e8b 100644
--- a/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/Heatmap.cs
@@ -153,8 +153,11 @@ namespace osu.Game.Rulesets.Osu.Statistics
                 }
             }
 
-            foreach (var o in offsets)
-                AddPoint(o.Position1, o.Position2, o.HitPosition, o.Radius);
+            if (offsets?.Count > 0)
+            {
+                foreach (var o in offsets)
+                    AddPoint(o.Position1, o.Position2, o.HitPosition, o.Radius);
+            }
 
             sizeLayout.Validate();
         }
diff --git a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
index a47d726988..0ba94b7101 100644
--- a/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/TimingDistributionGraph.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Rulesets.Osu.Statistics
         [BackgroundDependencyLoader]
         private void load()
         {
+            if (distribution?.Bins == null || distribution.Bins.Length == 0)
+                return;
+
             int maxCount = distribution.Bins.Max();
 
             var bars = new Drawable[distribution.Bins.Length];