diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index d50154485a..2ffb73f226 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Select.Carousel
             match &= !criteria.Artist.HasFilter || criteria.Artist.Matches(Beatmap.Metadata.Artist) ||
                      criteria.Artist.Matches(Beatmap.Metadata.ArtistUnicode);
 
-            match &= Beatmap.StarDifficulty >= criteria.DisplayStarsMinimum && Beatmap.StarDifficulty <= criteria.DisplayStarsMaximum;
+            match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(Beatmap.StarDifficulty);
 
             if (match)
             {
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 88a48a54fc..c851b201d7 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -42,11 +42,15 @@ namespace osu.Game.Screens.Select
                 Group = groupMode.Value,
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
-                Ruleset = ruleset.Value
-                DisplayStarsMinimum = minimumStars,
-                DisplayStarsMaximum = maximumStars,
+                Ruleset = ruleset.Value,
             };
 
+            if (!minimumStars.IsDefault)
+                criteria.UserStarDifficulty.Min = minimumStars.Value;
+
+            if (!maximumStars.IsDefault)
+                criteria.UserStarDifficulty.Max = maximumStars.Value;
+
             FilterQueryParser.ApplyQueries(criteria, query);
             return criteria;
         }
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index fb41c1d09a..27d9adc386 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -25,13 +25,12 @@ namespace osu.Game.Screens.Select
         public OptionalRange<BeatmapSetOnlineStatus> OnlineStatus;
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
+        public OptionalRange<double> UserStarDifficulty;
 
         public string[] SearchTerms = Array.Empty<string>();
 
         public RulesetInfo Ruleset;
         public bool AllowConvertedBeatmaps;
-        public double DisplayStarsMinimum;
-        public double DisplayStarsMaximum;
 
         private string searchText;