diff --git a/lib/game/bloc/game_bloc.dart b/lib/game/bloc/game_bloc.dart
index 67e19651..7c1b4f44 100644
--- a/lib/game/bloc/game_bloc.dart
+++ b/lib/game/bloc/game_bloc.dart
@@ -63,6 +63,7 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     if (achievedBonus) {
       emit(
         state.copyWith(
+          balls: state.balls + 1,
           activatedDashNests: {},
           bonusHistory: [
             ...state.bonusHistory,
diff --git a/lib/game/components/controlled_ball.dart b/lib/game/components/controlled_ball.dart
index 2a7b3585..8c501918 100644
--- a/lib/game/components/controlled_ball.dart
+++ b/lib/game/components/controlled_ball.dart
@@ -17,7 +17,7 @@ class ControlledBall extends Ball with Controls<BallController> {
   ControlledBall.launch({
     required PinballTheme theme,
   }) : super(baseColor: theme.characterTheme.ballColor) {
-    controller = LaunchedBallController(this);
+    controller = BallController(this);
   }
 
   /// {@template bonus_ball}
@@ -28,19 +28,20 @@ class ControlledBall extends Ball with Controls<BallController> {
   ControlledBall.bonus({
     required PinballTheme theme,
   }) : super(baseColor: theme.characterTheme.ballColor) {
-    controller = BonusBallController(this);
+    controller = BallController(this);
   }
 
   /// [Ball] used in [DebugPinballGame].
   ControlledBall.debug() : super(baseColor: const Color(0xFFFF0000)) {
-    controller = BonusBallController(this);
+    controller = _DebugBallController(this);
   }
 }
 
 /// {@template ball_controller}
 /// Controller attached to a [Ball] that handles its game related logic.
 /// {@endtemplate}
-abstract class BallController extends ComponentController<Ball> {
+class BallController extends ComponentController<Ball>
+    with HasGameRef<PinballGame> {
   /// {@macro ball_controller}
   BallController(Ball ball) : super(ball);
 
@@ -50,39 +51,17 @@ abstract class BallController extends ComponentController<Ball> {
   /// Triggered by [BottomWallBallContactCallback] when the [Ball] falls into
   /// a [BottomWall].
   /// {@endtemplate}
-  @mustCallSuper
   void lost() {
     component.shouldRemove = true;
+    gameRef.read<GameBloc>().add(const BallLost());
   }
 }
 
-/// {@template bonus_ball_controller}
-/// {@macro ball_controller}
-///
-/// A [BonusBallController] doesn't change the [GameState.balls] count.
-/// {@endtemplate}
-class BonusBallController extends BallController with HasGameRef<PinballGame> {
-  /// {@macro bonus_ball_controller}
-  BonusBallController(Ball<Forge2DGame> component) : super(component);
-}
-
-/// {@template launched_ball_controller}
-/// {@macro ball_controller}
-///
-/// A [LaunchedBallController] changes the [GameState.balls] count.
-/// {@endtemplate}
-class LaunchedBallController extends BallController
-    with HasGameRef<PinballGame> {
-  /// {@macro launched_ball_controller}
-  LaunchedBallController(Ball<Forge2DGame> ball) : super(ball);
+class _DebugBallController extends BallController {
+  _DebugBallController(Ball<Forge2DGame> component) : super(component);
 
-  /// Removes the [Ball] from a [PinballGame]; spawning a new [Ball] if
-  /// any are left.
-  ///
-  /// {@macro ball_controller_lost}
   @override
   void lost() {
-    super.lost();
-    gameRef.read<GameBloc>().add(const BallLost());
+    component.shouldRemove = true;
   }
 }
diff --git a/test/game/bloc/game_bloc_test.dart b/test/game/bloc/game_bloc_test.dart
index 557d408c..8ec53106 100644
--- a/test/game/bloc/game_bloc_test.dart
+++ b/test/game/bloc/game_bloc_test.dart
@@ -213,7 +213,7 @@ void main() {
           ),
           GameState(
             score: 0,
-            balls: 3,
+            balls: 4,
             activatedBonusLetters: [],
             activatedDashNests: {},
             bonusHistory: [GameBonus.dashNest],
diff --git a/test/game/components/controlled_ball_test.dart b/test/game/components/controlled_ball_test.dart
index 2b5b6313..53847b3c 100644
--- a/test/game/components/controlled_ball_test.dart
+++ b/test/game/components/controlled_ball_test.dart
@@ -14,52 +14,11 @@ import '../../helpers/helpers.dart';
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
-  group('BonusBallController', () {
-    late Ball ball;
-    late GameBloc gameBloc;
-
-    setUp(() {
-      ball = Ball(baseColor: const Color(0xFF00FFFF));
-      gameBloc = MockGameBloc();
-      whenListen(
-        gameBloc,
-        const Stream<GameState>.empty(),
-        initialState: const GameState.initial(),
-      );
-    });
-
-    final flameBlocTester = FlameBlocTester(
-      gameBuilder: EmptyPinballGameTest.new,
-      blocBuilder: () => gameBloc,
-    );
-
-    test('can be instantiated', () {
-      expect(
-        BonusBallController(ball),
-        isA<BonusBallController>(),
-      );
-    });
-
-    flameBlocTester.testGameWidget(
-      'lost removes ball',
-      setUp: (game, tester) async {
-        await game.add(ball);
-        final controller = BonusBallController(ball);
-        await ball.ensureAdd(controller);
-
-        controller.lost();
-        await game.ready();
-
-        expect(game.contains(ball), isFalse);
-      },
-    );
-  });
-
-  group('LaunchedBallController', () {
+  group('BallController', () {
     test('can be instantiated', () {
       expect(
-        LaunchedBallController(MockBall()),
-        isA<LaunchedBallController>(),
+        BallController(MockBall()),
+        isA<BallController>(),
       );
     });
 
@@ -85,7 +44,7 @@ void main() {
       flameBlocTester.testGameWidget(
         'lost adds BallLost to GameBloc',
         setUp: (game, tester) async {
-          final controller = LaunchedBallController(ball);
+          final controller = BallController(ball);
           await ball.add(controller);
           await game.ensureAdd(ball);