diff --git a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs
index 9af7329600..2885520106 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs
@@ -45,7 +45,9 @@ namespace osu.Desktop.VisualTests.Tests
             });
 
             AddRepeatStep("new retry/fail values", newRetryAndFailValues, 10);
-            AddStep("new ratings", newRatings);
+            AddStep("new ratings", () => details.Ratings = Enumerable.Range(1, 10));
+            AddStep("remove retries and fails", () => details.Retries = null );
+            AddStep("remove ratings", () => details.Ratings = null);
         }
 
         private int lastRange = 1;
@@ -56,7 +58,5 @@ namespace osu.Desktop.VisualTests.Tests
             details.Retries = Enumerable.Range(lastRange, 100).Select(i => (int)(Math.Sin(i) * 100));
             lastRange += 100;
         }
-
-        private void newRatings() => details.Ratings = Enumerable.Range(1, 10);
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index e3f087b95c..832ba74b89 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             set
             {
-                List<float> values = value.ToList();
+                List<float> values = value?.ToList() ?? new List<float>();
                 List<Bar> graphBars = Children.ToList();
                 for (int i = 0; i < values.Count; i++)
                     if (graphBars.Count > i)
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 23e3fcf0d5..a319d3841c 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Select
             }
             set
             {
-                ratings = value.ToList();
+                ratings = value?.ToList() ?? new List<int>();
                 if(ratings.Count == 0)
                     ratingsContainer.FadeOut(250);
                 else
@@ -99,7 +99,7 @@ namespace osu.Game.Screens.Select
             }
             set
             {
-                retries = value.ToList();
+                retries = value?.ToList() ?? new List<int>();
                 calcRetryAndFailGraph();
             }
         }
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.Select
             }
             set
             {
-                fails = value.ToList();
+                fails = value?.ToList() ?? new List<int>();
                 calcRetryAndFailGraph();
             }
         }
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.Select
             {
                 retryAndFailContainer.FadeIn(250);
                 failGraph.Values = fails.Select(fail => (float)fail);
-                retryGraph.Values = retries?.Select((retry, index) => (float)retry + fails[index]) ?? new List<float>();
+                retryGraph.Values = retries?.Select((retry, index) => (float)retry + fails[index]);
             }
         }