diff --git a/frontend/src/components/MakerForm/SelectCoordinator.tsx b/frontend/src/components/MakerForm/SelectCoordinator.tsx
index f4d0d910..1da8da6f 100644
--- a/frontend/src/components/MakerForm/SelectCoordinator.tsx
+++ b/frontend/src/components/MakerForm/SelectCoordinator.tsx
@@ -46,13 +46,13 @@ const SelectCoordinator: React.FC<SelectCoordinatorProps> = ({
 
   return (
     <Grid item>
-      <Grid sx={{ marginBottom: 1 }}>
-        {!coordinator?.info?.swap_enabled && (
+      {coordinator?.info && !coordinator?.info?.swap_enabled && (
+        <Grid sx={{ marginBottom: 1 }}>
           <Alert severity='warning' sx={{ marginTop: 2 }}>
             {t('This coordinator does not support on-chain swaps.')}
           </Alert>
-        )}
-      </Grid>
+        </Grid>
+      )}
       <Box
         sx={{
           backgroundColor: 'background.paper',
diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json
index a54f1568..9997f23b 100644
--- a/frontend/static/locales/ca.json
+++ b/frontend/static/locales/ca.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Prenedor",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "El proveïdor de la infraestructura LN i comunicacions. L'amfitrió serà l'encarregat de donar suport i resoldre disputes. LEs comissions de les transaccions són fixades per l'amfitrió. Assegureu-vos de seleccionar només els amfitrions en què confieu!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "L'enrutament Lightning ha fallat",
   "New chat message": "Nou missatge al xat",
diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json
index 75904e48..0254a258 100644
--- a/frontend/static/locales/cs.json
+++ b/frontend/static/locales/cs.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Příjemce",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",
diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json
index 40c4a188..822c1522 100644
--- a/frontend/static/locales/de.json
+++ b/frontend/static/locales/de.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",
diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json
index 0445fed7..dab08178 100644
--- a/frontend/static/locales/en.json
+++ b/frontend/static/locales/en.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",
diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json
index af580141..d5cdd6e7 100644
--- a/frontend/static/locales/es.json
+++ b/frontend/static/locales/es.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Tomador",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "Este coordinador no soporta pagos on-chain.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Enrutado Lightning fallido",
   "New chat message": "Nuevo mensaje en el chat",
diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json
index f892caff..a682a51a 100644
--- a/frontend/static/locales/eu.json
+++ b/frontend/static/locales/eu.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Hartzaile",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",
diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json
index d45e371c..ba6b2702 100644
--- a/frontend/static/locales/fr.json
+++ b/frontend/static/locales/fr.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Preneur",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Échec routage Lightning",
   "New chat message": "Nouveau message chat",
diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json
index cab37c4c..2a1d01b7 100644
--- a/frontend/static/locales/it.json
+++ b/frontend/static/locales/it.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Routing Lightning fallito",
   "New chat message": "Nuovo messaggio in chat",
diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json
index 09b04651..9ddb0d24 100644
--- a/frontend/static/locales/ja.json
+++ b/frontend/static/locales/ja.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "テイカー",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "ライトニングのルーティングに失敗しました",
   "New chat message": "チャットに新しいメッセージがあります",
diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json
index 7cde4383..84b2af78 100644
--- a/frontend/static/locales/pl.json
+++ b/frontend/static/locales/pl.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",
diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json
index 1b002e36..6faca78b 100644
--- a/frontend/static/locales/pt.json
+++ b/frontend/static/locales/pt.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "Nova mensagem de chat",
@@ -714,4 +715,4 @@
   "This order has been cancelled collaborativelly": "This order has been cancelled collaboratively",
   "This order is not available": "Esta ordem não está disponível",
   "The Robotic Satoshis working in the warehouse did not understand you. Please, fill a Bug Issue in Github https://github.com/RoboSats/robosats/issues": "The Robotic Satoshis working in the warehouse did not understand you. Please, fill a Bug Issue in Github https://github.com/RoboSats/robosats/issues"
-}
\ No newline at end of file
+}
diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json
index 737bac33..130ac3fd 100644
--- a/frontend/static/locales/ru.json
+++ b/frontend/static/locales/ru.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Тейкер",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Маршрутизация Lightning не удалась",
   "New chat message": "Новое сообщение в чате",
diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json
index 2934d0b3..1b5be900 100644
--- a/frontend/static/locales/sv.json
+++ b/frontend/static/locales/sv.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",
diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json
index 95e00ce1..d928fb40 100644
--- a/frontend/static/locales/sw.json
+++ b/frontend/static/locales/sw.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Mpokeaji",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Uhamishaji wa Lightning umeshindwa",
   "New chat message": "Ujumbe mpya wa mazungumzo",
diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json
index 638c1a52..5d1b4fb6 100644
--- a/frontend/static/locales/th.json
+++ b/frontend/static/locales/th.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",
diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json
index 9acc1ac5..03d51a2c 100644
--- a/frontend/static/locales/zh-SI.json
+++ b/frontend/static/locales/zh-SI.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "吃单方",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "闪电路由失败",
   "New chat message": "新消息",
diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json
index 8eac47b2..3bc237bb 100644
--- a/frontend/static/locales/zh-TR.json
+++ b/frontend/static/locales/zh-TR.json
@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "吃單方",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "閃電路由失敗",
   "New chat message": "新消息",