diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 7fab84eba8..f4b96b3884 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.cs
@@ -1,11 +1,8 @@
 // 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.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Objects;
@@ -34,7 +31,7 @@ namespace osu.Game.Rulesets.Replays
         /// </summary>
         public abstract Replay Generate();
 
-        protected virtual HitObject GetNextObject(int currentIndex)
+        protected virtual HitObject? GetNextObject(int currentIndex)
         {
             if (currentIndex >= Beatmap.HitObjects.Count - 1)
                 return null;
@@ -51,8 +48,7 @@ namespace osu.Game.Rulesets.Replays
         /// </summary>
         protected readonly List<TFrame> Frames = new List<TFrame>();
 
-        [CanBeNull]
-        protected TFrame LastFrame => Frames.Count == 0 ? null : Frames[^1];
+        protected TFrame? LastFrame => Frames.Count == 0 ? null : Frames[^1];
 
         protected AutoGenerator(IBeatmap beatmap)
             : base(beatmap)
diff --git a/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs b/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
index 6753a23bca..9a4af9e4ee 100644
--- a/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.cs
+++ b/osu.Game/Rulesets/Replays/Types/IConvertibleReplayFrame.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.Game.Beatmaps;
 using osu.Game.Replays.Legacy;
 
@@ -19,7 +17,7 @@ namespace osu.Game.Rulesets.Replays.Types
         /// <param name="currentFrame">The <see cref="LegacyReplayFrame"/> to extract values from.</param>
         /// <param name="beatmap">The beatmap.</param>
         /// <param name="lastFrame">The last post-conversion <see cref="ReplayFrame"/>, used to fill in missing delta information. May be null.</param>
-        void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame lastFrame = null);
+        void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame? lastFrame = null);
 
         /// <summary>
         /// Populates this <see cref="ReplayFrame"/> using values from a <see cref="LegacyReplayFrame"/>.