diff --git a/lib/features/app_layout/view/widgets/default_app_bar.dart b/lib/features/app_layout/view/widgets/default_app_bar.dart
index 1eb8beb..08924a6 100644
--- a/lib/features/app_layout/view/widgets/default_app_bar.dart
+++ b/lib/features/app_layout/view/widgets/default_app_bar.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/nav_cubit.dart';
+import 'package:syncrow_app/features/app_layout/bloc/spaces_cubit.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
 class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -10,19 +11,25 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<NavCubit, NavState>(
       builder: (context, state) {
-        return Padding(
-          padding: const EdgeInsets.only(
-            top: 20,
-          ),
-          child: AppBar(
-            backgroundColor: Colors.transparent,
-            leadingWidth: 150,
-            toolbarHeight: Constants.appBarHeight,
-            leading: NavCubit.appBarLeading[
-                NavCubit().bottomNavItems[NavCubit.pageIndex].label],
-            actions: NavCubit.appBarActions[
-                NavCubit().bottomNavItems[NavCubit.pageIndex].label],
-          ),
+        return BlocBuilder<SpacesCubit, SpacesState>(
+          builder: (context, state) {
+            return Padding(
+              padding: const EdgeInsets.only(
+                top: 20,
+              ),
+              child: AppBar(
+                backgroundColor: Colors.transparent,
+                leadingWidth: 150,
+                toolbarHeight: Constants.appBarHeight,
+                leading: SpacesCubit.spaces.isNotEmpty
+                    ? NavCubit.appBarLeading[
+                        NavCubit().bottomNavItems[NavCubit.pageIndex].label]
+                    : null,
+                actions: NavCubit.appBarActions[
+                    NavCubit().bottomNavItems[NavCubit.pageIndex].label],
+              ),
+            );
+          },
         );
       },
     );
diff --git a/lib/my_app.dart b/lib/my_app.dart
index 154b9e6..8e88cdb 100644
--- a/lib/my_app.dart
+++ b/lib/my_app.dart
@@ -27,6 +27,7 @@ class MyApp extends StatelessWidget {
           create: (context) => AuthCubit(),
         ),
         BlocProvider(
+          lazy: false,
           create: (context) => NavCubit(),
         ),
         BlocProvider(