diff --git a/packages/pinball_components/lib/src/components/layer.dart b/packages/pinball_components/lib/src/components/layer.dart
index 10477eff..6f027d4c 100644
--- a/packages/pinball_components/lib/src/components/layer.dart
+++ b/packages/pinball_components/lib/src/components/layer.dart
@@ -21,8 +21,7 @@ mixin Layered<T extends Forge2DGame> on BodyComponent<T> {
   set layer(Layer value) {
     _layer = value;
     if (!isLoaded) {
-      // TODO(alestiago): Use loaded.whenComplete once provided.
-      mounted.whenComplete(_applyMaskBits);
+      loaded.whenComplete(_applyMaskBits);
     } else {
       _applyMaskBits();
     }
diff --git a/packages/pinball_components/test/src/components/layer_test.dart b/packages/pinball_components/test/src/components/layer_test.dart
index f2372c45..d47702ea 100644
--- a/packages/pinball_components/test/src/components/layer_test.dart
+++ b/packages/pinball_components/test/src/components/layer_test.dart
@@ -57,8 +57,6 @@ void main() {
         const expectedLayer = Layer.spaceshipEntranceRamp;
         final component = TestLayeredBodyComponent()..layer = expectedLayer;
         await game.ensureAdd(component);
-        // TODO(alestiago): modify once component.loaded is available.
-        await component.mounted;
 
         _expectLayerOnFixtures(
           fixtures: component.body.fixtures,
@@ -79,8 +77,6 @@ void main() {
         component.layer = expectedLayer;
 
         await game.ensureAdd(component);
-        // TODO(alestiago): modify once component.loaded is available.
-        await component.mounted;
 
         _expectLayerOnFixtures(
           fixtures: component.body.fixtures,