diff --git a/lib/main.dart b/lib/main.dart
index b03d66e279f139cfe42164bc91c31d92b0e39636..5cc481d18e6c52f39cc2816f9e054769116c97ce 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -53,6 +53,12 @@ Future<void> main() async {
   // Get a valid GVA endpoint
   endPointGVA = await _homeProvider.getValidEndpoint();
 
+  if (endPointGVA == 'HS') {
+    _homeProvider.playSound('faché');
+  } else {
+    _homeProvider.playSound('start');
+  }
+
   if (kReleaseMode && enableSentry) {
     // CatcherOptions debugOptions = CatcherOptions(DialogReportMode(), [
     //   SentryHandler(SentryClient(SentryOptions(
diff --git a/lib/models/home.dart b/lib/models/home.dart
index 1ab7c03c730f64ac546ae22fe4b001aaa73b1fef..42ec662331e06144a8448fd12c613e8fc0d5df8e 100644
--- a/lib/models/home.dart
+++ b/lib/models/home.dart
@@ -61,11 +61,8 @@ class HomeProvider with ChangeNotifier {
       int listLenght = _listEndpoints.length - 1;
       if (i > listLenght) {
         log.e('NO VALID GVA ENDPOINT FOUND');
-        playSound('faché');
         _endpoint = 'HS';
         break;
-      } else {
-        playSound('start');
       }
       if (i != 0) {
         await Future.delayed(const Duration(milliseconds: 300));
diff --git a/lib/models/walletOptions.dart b/lib/models/walletOptions.dart
index 4381cd0951f5e80b844b1c5ed8668e6223e835dd..55974fa01070d8d39ee311bad711687040526b73 100644
--- a/lib/models/walletOptions.dart
+++ b/lib/models/walletOptions.dart
@@ -157,7 +157,7 @@ class WalletOptionsProvider with ChangeNotifier {
       context, _walletName, _walletNbr, _derivation) async {
     return showDialog<bool>(
       context: context,
-      barrierDismissible: true, // user must tap button!
+      barrierDismissible: true,
       builder: (BuildContext context) {
         return AlertDialog(
           title: Text('Choisissez un nouveau nom pour ce portefeuille'),