diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneCollectionButton.cs b/osu.Game.Tests/Visual/Ranking/TestSceneCollectionButton.cs
index 2cd75f6cef..4449aae257 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneCollectionButton.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneCollectionButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
@@ -18,7 +16,7 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public partial class TestSceneCollectionButton : OsuManualInputManagerTestScene
     {
-        private CollectionButton collectionButton;
+        private CollectionButton? collectionButton;
         private readonly BeatmapInfo beatmapInfo = new BeatmapInfo { OnlineID = 88 };
 
         [SetUpSteps]
@@ -43,7 +41,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             AddStep("click collection button", () =>
             {
-                InputManager.MoveMouseTo(collectionButton);
+                InputManager.MoveMouseTo(collectionButton!);
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -59,7 +57,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
             AddStep("click collection button", () =>
             {
-                InputManager.MoveMouseTo(collectionButton);
+                InputManager.MoveMouseTo(collectionButton!);
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneFavouriteButton.cs b/osu.Game.Tests/Visual/Ranking/TestSceneFavouriteButton.cs
index b281fc1bbf..a90fbc0c84 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneFavouriteButton.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneFavouriteButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
@@ -17,7 +15,7 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public partial class TestSceneFavouriteButton : OsuTestScene
     {
-        private FavouriteButton favourite;
+        private FavouriteButton? favourite;
 
         private readonly BeatmapSetInfo beatmapSetInfo = new BeatmapSetInfo { OnlineID = 88 };
         private readonly BeatmapSetInfo invalidBeatmapSetInfo = new BeatmapSetInfo();
@@ -83,7 +81,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
         private void checkEnabled(bool expected)
         {
-            AddAssert("is " + (expected ? "enabled" : "disabled"), () => favourite.Enabled.Value == expected);
+            AddAssert("is " + (expected ? "enabled" : "disabled"), () => favourite!.Enabled.Value == expected);
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/CollectionButton.cs b/osu.Game/Screens/Ranking/CollectionButton.cs
index 99a51e03d9..a3e2864c7e 100644
--- a/osu.Game/Screens/Ranking/CollectionButton.cs
+++ b/osu.Game/Screens/Ranking/CollectionButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
diff --git a/osu.Game/Screens/Ranking/FavouriteButton.cs b/osu.Game/Screens/Ranking/FavouriteButton.cs
index 95e1fdf985..caa0eddb55 100644
--- a/osu.Game/Screens/Ranking/FavouriteButton.cs
+++ b/osu.Game/Screens/Ranking/FavouriteButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -27,19 +25,19 @@ namespace osu.Game.Screens.Ranking
         private readonly SpriteIcon icon;
 
         public readonly BeatmapSetInfo BeatmapSetInfo;
-        private APIBeatmapSet beatmapSet;
+        private APIBeatmapSet? beatmapSet;
         private readonly Bindable<BeatmapSetFavouriteState> current;
 
-        private PostBeatmapFavouriteRequest favouriteRequest;
+        private PostBeatmapFavouriteRequest? favouriteRequest;
         private readonly LoadingLayer loading;
 
         private readonly IBindable<APIUser> localUser = new Bindable<APIUser>();
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         public FavouriteButton(BeatmapSetInfo beatmapSetInfo)
         {
@@ -102,6 +100,9 @@ namespace osu.Game.Screens.Ranking
 
         private void toggleFavouriteStatus()
         {
+            if (beatmapSet == null)
+                return;
+
             Enabled.Value = false;
             loading.Show();
 
@@ -144,9 +145,6 @@ namespace osu.Game.Screens.Ranking
 
         private void updateState()
         {
-            if (current?.Value == null)
-                return;
-
             if (current.Value.Favourited)
             {
                 background.Colour = colours.Green;