diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
index 03336ef488..bae3b66ed9 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private TestSceneOnlinePlayBeatmapAvailabilityTracker.TestBeatmapModelDownloader beatmapDownloader = null!;
 
+        private BeatmapSetInfo testBeatmapSetInfo = null!;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -34,15 +36,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             return dependencies;
         }
 
-        [Test]
-        public void TestBeatmapWithOnlineUpdates()
+        private UpdateBeatmapSetButton? getUpdateButton() => carousel.ChildrenOfType<UpdateBeatmapSetButton>().SingleOrDefault();
+
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            ArchiveDownloadRequest<IBeatmapSetInfo>? downloadRequest = null;
-
-            UpdateBeatmapSetButton? getUpdateButton() => carousel.ChildrenOfType<UpdateBeatmapSetButton>().SingleOrDefault();
-
-            var testBeatmapSetInfo = TestResources.CreateTestBeatmapSetInfo();
-
             AddStep("create carousel", () =>
             {
                 Child = carousel = new BeatmapCarousel
@@ -50,7 +48,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     RelativeSizeAxes = Axes.Both,
                     BeatmapSets = new List<BeatmapSetInfo>
                     {
-                        testBeatmapSetInfo,
+                        (testBeatmapSetInfo = TestResources.CreateTestBeatmapSetInfo()),
                     }
                 };
             });
@@ -58,6 +56,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddUntilStep("wait for load", () => carousel.BeatmapSetsLoaded);
 
             AddAssert("update button not visible", () => getUpdateButton() == null);
+        }
+
+        [Test]
+        public void TestDownloadToCompletion()
+        {
+            ArchiveDownloadRequest<IBeatmapSetInfo>? downloadRequest = null;
 
             AddStep("update online hash", () =>
             {
@@ -77,6 +81,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 return downloadRequest != null;
             });
 
+            AddUntilStep("wait for button disabled", () => getUpdateButton()?.Enabled.Value == false);
+
             AddUntilStep("progress download to completion", () =>
             {
                 if (downloadRequest is TestSceneOnlinePlayBeatmapAvailabilityTracker.TestDownloadRequest testRequest)
@@ -100,5 +106,49 @@ namespace osu.Game.Tests.Visual.SongSelect
                 return false;
             });
         }
+
+        [Test]
+        public void TestDownloadFailed()
+        {
+            ArchiveDownloadRequest<IBeatmapSetInfo>? downloadRequest = null;
+
+            AddStep("update online hash", () =>
+            {
+                testBeatmapSetInfo.Beatmaps.First().OnlineMD5Hash = "different hash";
+                testBeatmapSetInfo.Beatmaps.First().LastOnlineUpdate = DateTimeOffset.Now;
+
+                carousel.UpdateBeatmapSet(testBeatmapSetInfo);
+            });
+
+            AddUntilStep("update button visible", () => getUpdateButton() != null);
+
+            AddStep("click button", () => getUpdateButton()?.TriggerClick());
+
+            AddUntilStep("wait for download started", () =>
+            {
+                downloadRequest = beatmapDownloader.GetExistingDownload(testBeatmapSetInfo);
+                return downloadRequest != null;
+            });
+
+            AddUntilStep("wait for button disabled", () => getUpdateButton()?.Enabled.Value == false);
+
+            AddUntilStep("progress download to failure", () =>
+            {
+                if (downloadRequest is TestSceneOnlinePlayBeatmapAvailabilityTracker.TestDownloadRequest testRequest)
+                {
+                    testRequest.SetProgress(testRequest.Progress + 0.1f);
+
+                    if (testRequest.Progress >= 0.5f)
+                    {
+                        testRequest.TriggerFailure(new Exception());
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+
+            AddUntilStep("wait for button enabled", () => getUpdateButton()?.Enabled.Value == true);
+        }
     }
 }
diff --git a/osu.Game/Database/ModelDownloader.cs b/osu.Game/Database/ModelDownloader.cs
index 76717fd46f..a4d52426ab 100644
--- a/osu.Game/Database/ModelDownloader.cs
+++ b/osu.Game/Database/ModelDownloader.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Database
                 notification.State = ProgressNotificationState.Cancelled;
 
                 if (!(error is OperationCanceledException))
-                    Logger.Error(error, $"{importer.HumanisedModelName.Titleize()} download failed!");
+                    Logger.Error(error, $"{importer?.HumanisedModelName.Titleize()} download failed!");
             }
         }
 
diff --git a/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs b/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
index a11a29a5c6..89404b2878 100644
--- a/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
+++ b/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
@@ -90,12 +90,9 @@ namespace osu.Game.Screens.Select.Carousel
                 },
             });
 
-            TooltipText = "Update beatmap with online changes";
-
             Action = () =>
             {
                 beatmapDownloader.Download(beatmapSetInfo);
-
                 attachExistingDownload();
             };
         }
@@ -116,7 +113,15 @@ namespace osu.Game.Screens.Select.Carousel
                 Enabled.Value = false;
                 TooltipText = string.Empty;
 
-                download.DownloadProgressed += progress => progressFill.ResizeWidthTo(progress, 100);
+                download.DownloadProgressed += progress => progressFill.ResizeWidthTo(progress, 100, Easing.OutQuint);
+                download.Failure += _ => attachExistingDownload();
+            }
+            else
+            {
+                Enabled.Value = true;
+                TooltipText = "Update beatmap with online changes";
+
+                progressFill.ResizeWidthTo(0, 100, Easing.OutQuint);
             }
         }