diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart
index 9687ba3460..acfddcf78c 100644
--- a/lib/blocs/sync/sync_cubit.dart
+++ b/lib/blocs/sync/sync_cubit.dart
@@ -284,8 +284,6 @@ class SyncCubit extends Cubit<SyncState> {
 
       _syncProgress = _syncProgress.copyWith(drivesCount: drives.length);
 
-      syncFormatedPrint('Current block height number $currentBlockHeight');
-
       final driveSyncProcesses = drives.map((drive) => _syncDrive(
             drive.id,
             lastBlockHeight: calculateSyncLastBlockHeight(
@@ -582,7 +580,6 @@ class SyncCubit extends Cubit<SyncState> {
         200 ~/ (_syncProgress.drivesCount - _syncProgress.drivesSynced);
     var currentDriveEntitiesSynced = 0;
     var driveSyncProgress = 0.0;
-
     syncFormatedPrint(
         'number of drives at get metadata phase : ${_syncProgress.numberOfDrivesAtGetMetadataPhase}');
 
diff --git a/lib/pages/app_router_delegate.dart b/lib/pages/app_router_delegate.dart
index 391159adcf..9d69e1fece 100644
--- a/lib/pages/app_router_delegate.dart
+++ b/lib/pages/app_router_delegate.dart
@@ -86,7 +86,11 @@ class AppRouterDelegate extends RouterDelegate<AppRoutePath>
           // TODO: Find a better place to do this
           final lastLoggedInUser =
               state is ProfileLoggedIn ? state.walletAddress : null;
-          context.read<DriveDao>().deleteSharedPrivateDrives(lastLoggedInUser);
+          if (lastLoggedInUser != null) {
+            context
+                .read<DriveDao>()
+                .deleteSharedPrivateDrives(lastLoggedInUser);
+          }
         },
         builder: (context, state) {
           Widget? shell;