diff --git a/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/bottom_navigation_bar_layout.dart b/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/bottom_navigation_bar_layout.dart
index 8746fc0c..9027fa6c 100644
--- a/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/bottom_navigation_bar_layout.dart
+++ b/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/bottom_navigation_bar_layout.dart
@@ -57,9 +57,13 @@ class BottomNavigationBarLayout extends StructuralLayout {
   Widget build(BuildContext context) => Scaffold(
         body: body,
         bottomNavigationBar: custom?.call(
-              context.components.bottomNavigationBarComponent(barId).call(),
+              context.components
+                  .bottomNavigationBarComponentOrNull(barId)
+                  ?.call(),
             ) ??
-            context.components.bottomNavigationBarComponent(barId).call(),
+            context.components
+                .bottomNavigationBarComponentOrNull(barId)
+                ?.call(),
         floatingActionButtonLocation:
             scaffoldFieldsWrapper?.floatingActionButtonLocation,
         floatingActionButtonAnimator: