diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 6e64f5b786..46658bb993 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -297,10 +297,21 @@ namespace osu.Game.Overlays.SkinEditor
             {
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (!LoadedBeatmapSuccessfully)
+                    Scheduler.AddDelayed(this.Exit, 3000);
+            }
+
             protected override void Update()
             {
                 base.Update();
 
+                if (!LoadedBeatmapSuccessfully)
+                    return;
+
                 if (GameplayState.HasPassed)
                     GameplayClockContainer.Seek(0);
             }