diff --git a/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs b/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs
index 3a9eb2c1b0..03ab23d8e4 100644
--- a/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs
+++ b/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs
@@ -191,6 +191,13 @@ namespace osu.Game.Screens.Edit.Submission
             });
 
             completedSample = audio.Samples.Get(@"UI/bss-complete");
+
+            if (Beatmap.Value.BeatmapSetInfo.OnlineID > 0)
+            {
+                var req = new GetBeatmapSetRequest(Beatmap.Value.BeatmapSetInfo.OnlineID);
+                api.Queue(req);
+                settings.LatestOnlineStateRequest = req;
+            }
         }
 
         private void createBeatmapSet()
diff --git a/osu.Game/Screens/Edit/Submission/BeatmapSubmissionSettings.cs b/osu.Game/Screens/Edit/Submission/BeatmapSubmissionSettings.cs
index 8cccc339a6..a1f3861d29 100644
--- a/osu.Game/Screens/Edit/Submission/BeatmapSubmissionSettings.cs
+++ b/osu.Game/Screens/Edit/Submission/BeatmapSubmissionSettings.cs
@@ -8,6 +8,8 @@ namespace osu.Game.Screens.Edit.Submission
 {
     public class BeatmapSubmissionSettings
     {
+        public GetBeatmapSetRequest? LatestOnlineStateRequest { get; set; }
+
         public Bindable<BeatmapSubmissionTarget> Target { get; } = new Bindable<BeatmapSubmissionTarget>();
 
         public Bindable<bool> NotifyOnDiscussionReplies { get; } = new Bindable<bool>();
diff --git a/osu.Game/Screens/Edit/Submission/ScreenSubmissionSettings.cs b/osu.Game/Screens/Edit/Submission/ScreenSubmissionSettings.cs
index 969105b5c6..7b80fdee7d 100644
--- a/osu.Game/Screens/Edit/Submission/ScreenSubmissionSettings.cs
+++ b/osu.Game/Screens/Edit/Submission/ScreenSubmissionSettings.cs
@@ -1,16 +1,19 @@
 // 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.
 
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Localisation;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays;
 using osuTK;
@@ -25,8 +28,11 @@ namespace osu.Game.Screens.Edit.Submission
 
         public override LocalisableString? NextStepText => BeatmapSubmissionStrings.ConfirmSubmission;
 
+        [Resolved]
+        private BeatmapSubmissionSettings settings { get; set; } = null!;
+
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager configManager, OsuColour colours, BeatmapSubmissionSettings settings)
+        private void load(OsuConfigManager configManager, OsuColour colours)
         {
             configManager.BindWith(OsuSetting.EditorSubmissionNotifyOnDiscussionReplies, settings.NotifyOnDiscussionReplies);
             configManager.BindWith(OsuSetting.EditorSubmissionLoadInBrowserAfterSubmission, loadInBrowserAfterSubmission);
@@ -63,6 +69,25 @@ namespace osu.Game.Screens.Edit.Submission
                     },
                 }
             });
+
+            switch (settings.LatestOnlineStateRequest?.CompletionState)
+            {
+                case APIRequestCompletionState.Completed:
+                    setSubmissionTargetFromLatestOnlineState();
+                    break;
+
+                case APIRequestCompletionState.Waiting:
+                    settings.Target.Disabled = true;
+                    settings.LatestOnlineStateRequest.Success += _ => setSubmissionTargetFromLatestOnlineState();
+                    break;
+            }
+        }
+
+        private void setSubmissionTargetFromLatestOnlineState()
+        {
+            Debug.Assert(settings.LatestOnlineStateRequest != null);
+            settings.Target.Disabled = false;
+            settings.Target.Value = settings.LatestOnlineStateRequest.Response?.Status >= BeatmapOnlineStatus.Pending ? BeatmapSubmissionTarget.Pending : BeatmapSubmissionTarget.WIP;
         }
     }
 }