diff --git a/src/components/transfer.tsx b/src/components/transfer.tsx
index b926c33..c4e4c73 100644
--- a/src/components/transfer.tsx
+++ b/src/components/transfer.tsx
@@ -229,6 +229,8 @@ export default function Transfer() {
       } else if (sender_) {
         await transfer(bridgeInstance, sender_, recipient.address, transferAmount.amount, callback);
       }
+    } else {
+      notification.warn({ title: "Oops!", description: "Failed to construct bridge." });
     }
   }, [
     activeSenderAccount,
@@ -275,7 +277,6 @@ export default function Transfer() {
     !recipient?.valid ||
     !transferAmount.input ||
     !transferAmount.valid ||
-    needSwitchNetwork ||
     !!feeAlert ||
     !!existentialAlertOnSourceChain ||
     !!existentialAlertOnTargetChain;
@@ -362,7 +363,13 @@ export default function Transfer() {
       </TransferSection>
 
       {/* Send */}
-      <Button kind="primary" className="mt-4 py-middle" onClick={handleSend} disabled={disabledSend} busy={busy}>
+      <Button
+        kind="primary"
+        className="mt-4 py-middle"
+        onClick={handleSend}
+        disabled={!needSwitchNetwork && disabledSend}
+        busy={busy}
+      >
         {needSwitchNetwork ? "Switch network" : "Send"}
       </Button>
 
diff --git a/src/config/chains/hydradx-chain.ts b/src/config/chains/hydradx-chain.ts
index 76e16fc..216fe16 100644
--- a/src/config/chains/hydradx-chain.ts
+++ b/src/config/chains/hydradx-chain.ts
@@ -72,6 +72,7 @@ export const hydradxChain: ChainConfig = {
   /**
    * Substrate
    */
-  endpoint: "wss://rpc.hydradx.cloud",
+  // endpoint: "wss://rpc.hydradx.cloud",
+  endpoint: "wss://hydradx-rpc.dwellir.com",
   parachainId: ParachainID.HYDRADX,
 };
diff --git a/src/hooks/use-api.ts b/src/hooks/use-api.ts
index 07298d0..a384d5a 100644
--- a/src/hooks/use-api.ts
+++ b/src/hooks/use-api.ts
@@ -12,6 +12,7 @@ export function useApi(chain: ChainConfig) {
       setApi(_api);
     };
     const failedListener = () => {
+      console.error(new Error(`API has been disconnected from the endpoint(${chain.endpoint})`));
       setApi(undefined);
     };