diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 3e38b66029..760210c370 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -40,6 +40,13 @@ namespace osu.Game.Tests.Visual.Ranking
             AddSliderStep("height", 0.0f, 1000.0f, height.Value, height.Set);
         }
 
+        [Test]
+        public void TestZeroEvents()
+        {
+            createTest(new List<HitEvent>());
+            AddStep("update offset", () => graph.UpdateOffset(10));
+        }
+
         [Test]
         public void TestManyDistributedEventsOffset()
         {
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 207e19a716..a9b93e0ffc 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             for (int i = 1; i <= axis_points; i++)
             {
                 double axisValue = i * axisValueStep;
-                float position = (float)(axisValue / maxValue);
+                float position = maxValue == 0 ? 0 : (float)(axisValue / maxValue);
                 float alpha = 1f - position * 0.8f;
 
                 axisFlow.Add(new OsuSpriteText
@@ -348,7 +348,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
             }
 
-            private float offsetForValue(float value) => (1 - minimum_height) * value / maxValue;
+            private float offsetForValue(float value) => maxValue == 0 ? 0 : (1 - minimum_height) * value / maxValue;
 
             private float heightForValue(float value) => minimum_height + offsetForValue(value);
         }