diff --git a/rust/src/game/mod.rs b/rust/src/game/mod.rs
index 882430d..d97d01a 100644
--- a/rust/src/game/mod.rs
+++ b/rust/src/game/mod.rs
@@ -849,7 +849,6 @@ impl Game {
             self.run_deferred(move |s| {
                 s.handle_swap_weapon(player_id, WeaponType::Ball, true, false)
             });
-            self.ball_holder = Some(player_id);
         }
     }
 
@@ -866,7 +865,10 @@ impl Game {
         }
 
         if weapon_type == WeaponType::Ball {
-            self.run_deferred(move |s| s.signals().on_pickup_ball().emit(player_id));
+            self.ball_holder = Some(player_id);
+            self.run_deferred(move |s| {
+                s.signals().on_pickup_ball().emit(player_id);
+            });
         }
 
         if let Some(player) = self.find_player(player_id).clone()