diff --git a/lib/l10n/app_bg.arb b/lib/l10n/app_bg.arb
index b94b2cbd..b88e3bae 100644
--- a/lib/l10n/app_bg.arb
+++ b/lib/l10n/app_bg.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Неуспешно изтриване на канала \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "bg",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Контакти",
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 3963e317..a1647fa3 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Kanal {name} konnte nicht gelöscht werden",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "de",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Kontakte",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 8f231e78..eec03bc3 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -365,6 +365,14 @@
       }
     }
   },
+  "channels_channelDeleteFailed": "Failed to delete channel \"{name}\"",
+  "@channels_channelDeleteFailed": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
   "channels_channelDeleted": "Channel \"{name}\" deleted",
   "@channels_channelDeleted": {
     "placeholders": {
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index d1940937..2f62b543 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "No se pudo eliminar el canal \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "es",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contactos",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index f3e9ea83..9eb66e7b 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Échec de la suppression de la chaîne \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "fr",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contacts",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 8b095f5f..e08dd675 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Impossibile eliminare il canale \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "it",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contatti",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 5f0cd5e1..54e9cdcd 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -1582,6 +1582,12 @@ abstract class AppLocalizations {
   /// **'Delete \"{name}\"? This cannot be undone.'**
   String channels_deleteChannelConfirm(String name);
 
+  /// No description provided for @channels_channelDeleteFailed.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to delete channel \"{name}\"'**
+  String channels_channelDeleteFailed(String name);
+
   /// No description provided for @channels_channelDeleted.
   ///
   /// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart
index 91e5a947..21a6e795 100644
--- a/lib/l10n/app_localizations_bg.dart
+++ b/lib/l10n/app_localizations_bg.dart
@@ -820,6 +820,11 @@ class AppLocalizationsBg extends AppLocalizations {
     return 'Изтрий \"$name\"? Това не може да бъде отменено.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Неуспешно изтриване на канала \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Каналът \"$name\" е изтрит';
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index 4c591e5c..e5a3a49d 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -817,6 +817,11 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Löschen von \"$name\"? Dies kann nicht rückgängig gemacht werden.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Kanal $name konnte nicht gelöscht werden';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Kanal \"$name\" gelöscht';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 98fee85a..a56e2174 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -808,6 +808,11 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Delete \"$name\"? This cannot be undone.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Failed to delete channel \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Channel \"$name\" deleted';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index b868aadd..98cd658d 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -818,6 +818,11 @@ class AppLocalizationsEs extends AppLocalizations {
     return 'Eliminar \"$name\"? Esto no se puede deshacer.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'No se pudo eliminar el canal \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Canal \"$name\" eliminado';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index a939e091..a52ff004 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -820,6 +820,11 @@ class AppLocalizationsFr extends AppLocalizations {
     return 'Supprimer $name? Cela ne peut pas être annulé.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Échec de la suppression de la chaîne \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Le canal \"$name\" a été supprimé';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index d4cda691..aebea2ff 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -816,6 +816,11 @@ class AppLocalizationsIt extends AppLocalizations {
     return 'Eliminare \"$name\"? Non può essere annullato.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Impossibile eliminare il canale \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Canale \"$name\" eliminato';
diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart
index 5c382270..5460d29c 100644
--- a/lib/l10n/app_localizations_nl.dart
+++ b/lib/l10n/app_localizations_nl.dart
@@ -813,6 +813,11 @@ class AppLocalizationsNl extends AppLocalizations {
     return 'Verwijderen \"$name\"? Dit kan niet worden teruggedraaid.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Kan kanaal $name niet verwijderen';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Kanaal \"$name\" verwijderd';
diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart
index 6f68786e..72860335 100644
--- a/lib/l10n/app_localizations_pl.dart
+++ b/lib/l10n/app_localizations_pl.dart
@@ -818,6 +818,11 @@ class AppLocalizationsPl extends AppLocalizations {
     return 'Usuń \"$name\"? Nie można tego cofnąć.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Nie udało się usunąć kanału \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Kanał \"$name\" usunięto';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index cedf4007..025c81ca 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -819,6 +819,11 @@ class AppLocalizationsPt extends AppLocalizations {
     return 'Excluir \"$name\"? Não pode ser desfeito.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Falha ao excluir o canal \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Canal \"$name\" excluído';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index d35b1749..399b158d 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -817,6 +817,11 @@ class AppLocalizationsRu extends AppLocalizations {
     return 'Удалить \"$name\"? Это действие нельзя отменить.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Не удалось удалить канал $name.';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Канал \"$name\" удалён';
diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart
index c4f9a920..51383119 100644
--- a/lib/l10n/app_localizations_sk.dart
+++ b/lib/l10n/app_localizations_sk.dart
@@ -813,6 +813,11 @@ class AppLocalizationsSk extends AppLocalizations {
     return 'Odstrániť \"$name\"? To sa nedá zrušiť.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Kanál \"$name\" sa nepodarilo odstrániť';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Kanál \"$name\" bol odstránený';
diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart
index a012ef11..f42e8e07 100644
--- a/lib/l10n/app_localizations_sl.dart
+++ b/lib/l10n/app_localizations_sl.dart
@@ -811,6 +811,11 @@ class AppLocalizationsSl extends AppLocalizations {
     return 'Izbrišem \"$name\"? To se ne da povrniti.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Kanala $name ni bilo mogoče izbrisati';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Kanal \"$name\" izbrisan.';
diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart
index abfd89c2..ba99455d 100644
--- a/lib/l10n/app_localizations_sv.dart
+++ b/lib/l10n/app_localizations_sv.dart
@@ -807,6 +807,11 @@ class AppLocalizationsSv extends AppLocalizations {
     return 'Radera \"$name\"? Detta kan inte ångras.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Det gick inte att ta bort kanalen \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Kanalen \"$name\" raderad';
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
index c6b8ff23..e2bbbe8a 100644
--- a/lib/l10n/app_localizations_uk.dart
+++ b/lib/l10n/app_localizations_uk.dart
@@ -815,6 +815,11 @@ class AppLocalizationsUk extends AppLocalizations {
     return 'Видалити $name? Це не можна скасувати.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return 'Не вдалося видалити канал \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return 'Канал «$name» видалено';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 5677c090..4da17ea7 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -775,6 +775,11 @@ class AppLocalizationsZh extends AppLocalizations {
     return 'Delete \"$name\"? This cannot be undone.';
   }
 
+  @override
+  String channels_channelDeleteFailed(String name) {
+    return '无法删除频道 \"$name\"';
+  }
+
   @override
   String channels_channelDeleted(String name) {
     return '删除频道 \"$name\"';
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index a94560bf..cb690fb6 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Kan kanaal {name} niet verwijderen",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "nl",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contacten",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index 2af10587..21619834 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Nie udało się usunąć kanału \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "pl",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Kontakty",
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index c9d37241..8a02a4d4 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Falha ao excluir o canal \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "pt",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Contactos",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index e1a2066f..ab2ed36b 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Не удалось удалить канал {name}.",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "ru",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Контакты",
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
index 34e5933e..ff958971 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Kanál \"{name}\" sa nepodarilo odstrániť",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "sk",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Kontakty",
diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb
index 1371f97e..bd431d4d 100644
--- a/lib/l10n/app_sl.arb
+++ b/lib/l10n/app_sl.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Kanala {name} ni bilo mogoče izbrisati",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "sl",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Stiki",
diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb
index 2bdaec4b..86da858d 100644
--- a/lib/l10n/app_sv.arb
+++ b/lib/l10n/app_sv.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Det gick inte att ta bort kanalen \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "sv",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Kontakter",
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index 13d93620..691aa8db 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "Не вдалося видалити канал \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "uk",
   "appTitle": "MeshCore Open",
   "nav_contacts": "Контакти",
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index b2dc3305..f6bb5261 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -1,4 +1,6 @@
 {
+  "channels_channelDeleteFailed": "无法删除频道 \"{name}\"",
+  "@channels_channelDeleteFailed": { "placeholders": { "name": { "type": "String" } } },
   "@@locale": "zh",
   "appTitle": "MeshCore Open",
   "nav_contacts": "联系方式",
diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart
index 12e2a311..582fee74 100644
--- a/lib/screens/channels_screen.dart
+++ b/lib/screens/channels_screen.dart
@@ -489,12 +489,13 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     ChannelMessageStore channelMessageStore,
     Channel channel,
   ) {
+    final parentContext = context;
     final settingsService = context.read<AppSettingsService>();
     final isMuted = settingsService.isChannelMuted(channel.name);
 
     showModalBottomSheet(
-      context: context,
-      builder: (context) => SafeArea(
+      context: parentContext,
+      builder: (sheetContext) => SafeArea(
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
@@ -502,10 +503,10 @@ class _ChannelsScreenState extends State<ChannelsScreen>
               leading: const Icon(Icons.edit_outlined),
               title: Text(context.l10n.channels_editChannel),
               onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                 await Future.delayed(const Duration(milliseconds: 100));
-                if (context.mounted) {
-                  _showEditChannelDialog(context, connector, channel);
+                if (parentContext.mounted) {
+                  _showEditChannelDialog(parentContext, connector, channel);
                 }
               },
             ),
@@ -521,7 +522,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                     : context.l10n.channels_muteChannel,
               ),
               onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                 if (isMuted) {
                   await settingsService.unmuteChannel(channel.name);
                 } else {
@@ -536,9 +537,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                 style: const TextStyle(color: Colors.red),
               ),
               onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                 await Future.delayed(const Duration(milliseconds: 100));
-                if (context.mounted) {
+                if (parentContext.mounted) {
                   _confirmDeleteChannel(
                     context,
                     connector,
@@ -1454,7 +1455,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
               child: Text(dialogContext.l10n.common_cancel),
             ),
             FilledButton(
-              onPressed: () {
+              onPressed: () async {
                 final name = nameController.text.trim();
                 final pskHex = pskController.text.trim();
 
@@ -1471,13 +1472,25 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                 }
 
                 Navigator.pop(dialogContext);
-                connector.setChannel(channel.index, name, psk);
-                connector.setChannelSmazEnabled(channel.index, smazEnabled);
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(context.l10n.channels_channelUpdated(name)),
-                  ),
-                );
+                try {
+                  await connector.setChannel(channel.index, name, psk);
+                  await connector.setChannelSmazEnabled(
+                    channel.index,
+                    smazEnabled,
+                  );
+                  if (!context.mounted) return;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(context.l10n.channels_channelUpdated(name)),
+                    ),
+                  );
+                } catch (e, st) {
+                  debugPrint(st.toString());
+                  if (!context.mounted) return;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(content: Text('Failed to update channel: $e')),
+                  );
+                }
               },
               child: Text(dialogContext.l10n.common_save),
             ),
@@ -1506,17 +1519,36 @@ class _ChannelsScreenState extends State<ChannelsScreen>
             child: Text(dialogContext.l10n.common_cancel),
           ),
           TextButton(
-            onPressed: () {
+            onPressed: () async {
               Navigator.pop(dialogContext);
-              connector.deleteChannel(channel.index);
-              channelMessageStore.clearChannelMessages(channel.index);
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text(
-                    context.l10n.channels_channelDeleted(channel.name),
+              try {
+                await connector.deleteChannel(channel.index);
+
+                channelMessageStore.clearChannelMessages(channel.index);
+
+                if (!context.mounted) return;
+
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      context.l10n.channels_channelDeleted(channel.name),
+                    ),
                   ),
-                ),
-              );
+                );
+              } catch (e, st) {
+                if (!context.mounted) return;
+
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      context.l10n.channels_channelDeleteFailed(channel.name),
+                    ),
+                  ),
+                );
+
+                // Preserve existing logging (if it was there)
+                debugPrint('Failed to delete channel: $e\n$st');
+              }
             },
             child: Text(
               dialogContext.l10n.common_delete,
diff --git a/pubspec.lock b/pubspec.lock
index fa23b27e..aa8819e0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1140,4 +1140,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.10.3 <4.0.0"
-  flutter: ">=3.38.4"
+  flutter: ">=3.38.4"
\ No newline at end of file