diff --git a/osu.Game/Overlays/Mods/ModCustomisationHeader.cs b/osu.Game/Overlays/Mods/ModCustomisationHeader.cs
index fbdce7be6d..5a9e6099e6 100644
--- a/osu.Game/Overlays/Mods/ModCustomisationHeader.cs
+++ b/osu.Game/Overlays/Mods/ModCustomisationHeader.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Mods
 
         public readonly BindableBool Expanded = new BindableBool();
 
-        protected new ModCustomisationPanel Parent => (ModCustomisationPanel)base.Parent;
+        protected new ModCustomisationPanel? Parent => (ModCustomisationPanel?)base.Parent;
 
         public ModCustomisationHeader()
         {
@@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Mods
         {
             if (Enabled.Value)
             {
-                Parent.UpdateHoverExpansion(true);
+                Parent?.UpdateHoverExpansion(true);
             }
 
             return base.OnHover(e);
diff --git a/osu.Game/Overlays/Mods/ModCustomisationPanel.cs b/osu.Game/Overlays/Mods/ModCustomisationPanel.cs
index a82e279d01..ee8232b79a 100644
--- a/osu.Game/Overlays/Mods/ModCustomisationPanel.cs
+++ b/osu.Game/Overlays/Mods/ModCustomisationPanel.cs
@@ -179,7 +179,8 @@ namespace osu.Game.Overlays.Mods
             expandedByHovering = false;
         }
 
-        private bool expandedByHovering = false;
+        private bool expandedByHovering;
+
         public void UpdateHoverExpansion(bool hovered)
         {
             if (hovered && !Expanded.Value)
@@ -223,11 +224,11 @@ namespace osu.Game.Overlays.Mods
             public override bool RequestsFocus => Expanded.Value;
             public override bool AcceptsFocus => Expanded.Value;
 
-            public new ModCustomisationPanel Parent => (ModCustomisationPanel)base.Parent;
+            public new ModCustomisationPanel? Parent => (ModCustomisationPanel?)base.Parent;
 
             protected override void OnHoverLost(HoverLostEvent e)
             {
-                Parent.UpdateHoverExpansion(false);
+                Parent?.UpdateHoverExpansion(false);
                 base.OnHoverLost(e);
             }
         }