diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index ef0fa36b16..611b47c120 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Beatmaps
                         if (cancellationToken.IsCancellationRequested)
                             return;
 
-                        var starDifficulty = task.GetResultSafely();
+                        StarDifficulty? starDifficulty = task.GetResultSafely();
 
                         if (starDifficulty != null)
                             bindable.Value = starDifficulty.Value;
diff --git a/osu.Game/Beatmaps/StarDifficulty.cs b/osu.Game/Beatmaps/StarDifficulty.cs
index e042f1c698..6aac275a6a 100644
--- a/osu.Game/Beatmaps/StarDifficulty.cs
+++ b/osu.Game/Beatmaps/StarDifficulty.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public StarDifficulty([NotNull] DifficultyAttributes attributes)
         {
-            Stars = attributes.StarRating;
+            Stars = double.IsFinite(attributes.StarRating) ? attributes.StarRating : 0;
             MaxCombo = attributes.MaxCombo;
             Attributes = attributes;
             // Todo: Add more members (BeatmapInfo.DifficultyRating? Attributes? Etc...)
@@ -46,7 +46,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public StarDifficulty(double starDifficulty, int maxCombo)
         {
-            Stars = starDifficulty;
+            Stars = double.IsFinite(starDifficulty) ? starDifficulty : 0;
             MaxCombo = maxCombo;
             Attributes = null;
         }