diff --git a/lib/ui/views/farm_list/farm_list_sheet.dart b/lib/ui/views/farm_list/farm_list_sheet.dart
index 96cb5ffe..6d7cca70 100755
--- a/lib/ui/views/farm_list/farm_list_sheet.dart
+++ b/lib/ui/views/farm_list/farm_list_sheet.dart
@@ -5,7 +5,6 @@ import 'package:aedex/ui/views/farm_list/components/farm_details_front.dart';
 import 'package:aedex/ui/views/main_screen/bloc/provider.dart';
 import 'package:aedex/ui/views/main_screen/layouts/main_screen_list.dart';
 import 'package:aedex/ui/views/util/components/dex_archethic_uco.dart';
-import 'package:aedex/ui/views/util/components/failure_message.dart';
 
 import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutter.dart'
     as aedappfm;
@@ -57,13 +56,7 @@ Widget _body(BuildContext context, WidgetRef ref) {
       child: asyncFarms.when(
         skipLoadingOnRefresh: true,
         skipLoadingOnReload: true,
-        error: (error, stackTrace) => aedappfm.ErrorMessage(
-          failure: aedappfm.Failure.fromError(error),
-          failureMessage: FailureMessage(
-            context: context,
-            failure: aedappfm.Failure.fromError(error),
-          ).getMessage(),
-        ),
+        error: (error, stacktrace) => const aedappfm.Loading(),
         loading: aedappfm.Loading.new,
         data: (farms) => GridView.builder(
           gridDelegate: const aedappfm.SliverGridDelegateWithFixedSize(
diff --git a/lib/ui/views/main_screen/layouts/connection_to_wallet_status.dart b/lib/ui/views/main_screen/layouts/connection_to_wallet_status.dart
index 747891b9..ba758928 100755
--- a/lib/ui/views/main_screen/layouts/connection_to_wallet_status.dart
+++ b/lib/ui/views/main_screen/layouts/connection_to_wallet_status.dart
@@ -2,12 +2,14 @@
 import 'package:aedex/application/notification.dart';
 import 'package:aedex/application/session/provider.dart';
 import 'package:aedex/ui/views/notifications/layouts/tasks_notification_widget.dart';
+import 'package:aedex/ui/views/swap/layouts/swap_sheet.dart';
 import 'package:aedex/ui/views/util/components/format_address_link_copy.dart';
 import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutter.dart'
     as aedappfm;
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
 
 class ConnectionToWalletStatus extends ConsumerStatefulWidget {
   const ConnectionToWalletStatus({
@@ -39,6 +41,7 @@ class _ConnectionToWalletStatusState
           ),
         );
         ref.read(SessionProviders.session.notifier).setOldNameAccount();
+        context.go(SwapSheet.routerPage);
       });
     }