diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 5c070bae3b..e2dc511391 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.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;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
@@ -15,7 +13,6 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics.Containers;
-using JetBrains.Annotations;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
@@ -32,11 +29,11 @@ namespace osu.Game.Users
         /// Perform an action in addition to showing the user's profile.
         /// This should be used to perform auxiliary tasks and not as a primary action for clicking a user panel (to maintain a consistent UX).
         /// </summary>
-        public new Action Action;
+        public new Action? Action;
 
-        protected Action ViewProfile { get; private set; }
+        protected Action ViewProfile { get; private set; } = null!;
 
-        protected Drawable Background { get; private set; }
+        protected Drawable Background { get; private set; } = null!;
 
         protected UserPanel(APIUser user)
             : base(HoverSampleSet.Button)
@@ -46,23 +43,23 @@ namespace osu.Game.Users
             User = user;
         }
 
-        [Resolved(canBeNull: true)]
-        private UserProfileOverlay profileOverlay { get; set; }
+        [Resolved]
+        private UserProfileOverlay? profileOverlay { get; set; }
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private ChannelManager channelManager { get; set; }
+        private ChannelManager? channelManager { get; set; }
 
         [Resolved]
-        private ChatOverlay chatOverlay { get; set; }
-
-        [Resolved(canBeNull: true)]
-        protected OverlayColourProvider ColourProvider { get; private set; }
+        private ChatOverlay? chatOverlay { get; set; }
 
         [Resolved]
-        protected OsuColour Colours { get; private set; }
+        protected OverlayColourProvider? ColourProvider { get; private set; }
+
+        [Resolved]
+        protected OsuColour Colours { get; private set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -93,7 +90,6 @@ namespace osu.Game.Users
             };
         }
 
-        [NotNull]
         protected abstract Drawable CreateLayout();
 
         protected OsuSpriteText CreateUsername() => new OsuSpriteText