diff --git a/packages/pinball_components/lib/src/components/flipper.dart b/packages/pinball_components/lib/src/components/flipper.dart
index c9580510..e57ba773 100644
--- a/packages/pinball_components/lib/src/components/flipper.dart
+++ b/packages/pinball_components/lib/src/components/flipper.dart
@@ -52,7 +52,6 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition {
     );
     final joint = _FlipperJoint(jointDef);
     world.createJoint(joint);
-    unawaited(mounted.whenComplete(joint.unlock));
   }
 
   List<FixtureDef> _createFixtureDefs() {
@@ -127,6 +126,15 @@ class Flipper extends BodyComponent with KeyboardHandler, InitialPosition {
 
     return body;
   }
+
+  @override
+  void onMount() {
+    super.onMount();
+
+    gameRef.ready().whenComplete(
+          () => body.joints.whereType<_FlipperJoint>().first.unlock(),
+        );
+  }
 }
 
 class _FlipperSpriteComponent extends SpriteComponent with HasGameRef {
@@ -207,11 +215,8 @@ class _FlipperJoint extends RevoluteJoint {
   /// The joint is locked when initialized in order to force the [Flipper]
   /// at its resting position.
   void lock() {
-    const angle = _halfSweepingAngle;
-    setLimits(
-      -angle * side.direction,
-      -angle * side.direction,
-    );
+    final angle = -_halfSweepingAngle * side.direction;
+    setLimits(angle, angle);
   }
 
   /// Unlocks the [Flipper] from its resting position.