diff --git a/src/overlay/elements/leaderboard/bg_generator.rs b/src/overlay/elements/leaderboard/bg_generator.rs
index f8a8b44..9ce6c46 100644
--- a/src/overlay/elements/leaderboard/bg_generator.rs
+++ b/src/overlay/elements/leaderboard/bg_generator.rs
@@ -60,7 +60,7 @@ impl BackgroundGenerator {
                                 clear_value: ClearValue::Color([0.0, 0.0, 0.0, 0.0]),
                             })
                             .set_sample_count(max_supported_sample_count)
-                            .add_resolve_targets(vec![image.clone()])
+                            .add_resolve_targets((vec![image.clone()], true))
                             .use_queue(queue.clone())
                             .build(&device)?,
                     )
diff --git a/src/overlay/elements/leaderboard/mod.rs b/src/overlay/elements/leaderboard/mod.rs
index e80cb4b..e8d534b 100644
--- a/src/overlay/elements/leaderboard/mod.rs
+++ b/src/overlay/elements/leaderboard/mod.rs
@@ -396,6 +396,14 @@ impl UiOverlay for LeaderBoard {}
 
 impl DataReceiver for LeaderBoard {
     fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> {
+        for i in 0..self.leaderboard_grid.dimensions().1 {
+            self.leaderboard_grid.detach(0, i)?;
+        }
+
+        for i in 0..self.deltaboard_grid.dimensions().1 {
+            self.deltaboard_grid.detach(0, i)?;
+        }
+
         match phase {
             GamePhase::Practice | GamePhase::Qualifying | GamePhase::TestDay => {
                 for entry in self.leaderboard_entries.iter_mut() {