diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index eda5f1b9a3..de63e7cdca 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
@@ -35,11 +36,22 @@ namespace osu.Game.Database
 
             if (connection == null)
             {
-                connection = storage.GetDatabase(@"beatmaps");
-                connection.CreateTable<BeatmapMetadata>();
-                connection.CreateTable<BaseDifficulty>();
-                connection.CreateTable<BeatmapSetInfo>();
-                connection.CreateTable<BeatmapInfo>();
+                retry:
+                try
+                {
+                    connection = storage.GetDatabase(@"beatmaps");
+                    connection.CreateTable<BeatmapMetadata>();
+                    connection.CreateTable<BaseDifficulty>();
+                    connection.CreateTable<BeatmapSetInfo>();
+                    connection.CreateTable<BeatmapInfo>();
+                }
+                catch
+                {
+                    Debug.WriteLine(@"Beatmap database was unable to be migrated; starting fresh!");
+                    connection?.Close();
+                    storage.DeleteDatabase(@"beatmaps");
+                    goto retry;
+                }
             }
         }