diff --git a/app/database/beatmap.py b/app/database/beatmap.py
index d821e27..48e7fa0 100644
--- a/app/database/beatmap.py
+++ b/app/database/beatmap.py
@@ -86,7 +86,16 @@ class Beatmap(BeatmapBase, table=True):
         )
         session.add(beatmap)
         await session.commit()
-        await session.refresh(beatmap)
+        beatmap = (
+            await session.exec(
+                select(Beatmap)
+                .options(
+                    joinedload(Beatmap.beatmapset).selectinload(Beatmapset.beatmaps)  # pyright: ignore[reportArgumentType]
+                )
+                .where(Beatmap.id == resp.id)
+            )
+        ).first()
+        assert beatmap is not None, "Beatmap should not be None after commit"
         return beatmap
 
     @classmethod