diff --git a/app/src/chain/client/cosmos/components/WalletProviderWrapper/WalletProviderWrapper.tsx b/app/src/chain/client/cosmos/components/WalletProviderWrapper/WalletProviderWrapper.tsx
index a7cd489..2a77c60 100644
--- a/app/src/chain/client/cosmos/components/WalletProviderWrapper/WalletProviderWrapper.tsx
+++ b/app/src/chain/client/cosmos/components/WalletProviderWrapper/WalletProviderWrapper.tsx
@@ -1,5 +1,3 @@
-"use client";
-
 import { WalletProvider } from "../WalletProvider";
 import { ChainProvider } from "@cosmos-kit/react";
 import { useNetwork } from "../NetworkProvider";
@@ -18,10 +16,10 @@ export function WalletProviderWrapper({
 }: {
   children: React.ReactNode;
 }) {
-  const { networkMeta: meta } = useNetwork();
+  const { networkMeta: meta, currentNetwork } = useNetwork();
   const wallets = [new KeplrExtensionWallet(keplrExtensionInfo)];
 
-  const chain = getOverlockChain(meta);
+  const chain = getOverlockChain(meta, currentNetwork);
   const assetList = getOverlockAssetList(meta);
 
   return (
@@ -31,6 +29,14 @@ export function WalletProviderWrapper({
       throwErrors={false}
       assetLists={[assetList]}
       walletModal={DefaultModal}
+      endpointOptions={{
+        endpoints: {
+          [meta.chain_name]: {
+            rpc: meta.apis.rpc.map((api) => api.address),
+            rest: meta.apis.rest.map((api) => api.address),
+          },
+        },
+      }}
     >
       <WalletProvider>{children}</WalletProvider>
     </ChainProvider>
diff --git a/app/src/chain/client/cosmos/lib/utils.ts b/app/src/chain/client/cosmos/lib/utils.ts
index ea703a8..cbc09b4 100644
--- a/app/src/chain/client/cosmos/lib/utils.ts
+++ b/app/src/chain/client/cosmos/lib/utils.ts
@@ -12,7 +12,7 @@ import {
   ibcProtoRegistry,
 } from "interchain";
 import type { AssetList, Chain } from "@chain-registry/types";
-import { NetworkMeta } from "./types";
+import { Network, NetworkMeta } from "./types";
 
 export const protoRegistry: ReadonlyArray<[string, GeneratedType]> = [
   ...cosmosProtoRegistry,
@@ -30,11 +30,15 @@ export const aminoConverters = {
 
 export const COIN_DECIMALS = 6;
 
-export function getOverlockChain(meta: NetworkMeta): Chain {
+export function getOverlockChain(
+  meta: NetworkMeta,
+  currentNetwork: Network,
+): Chain {
+  const network_type = currentNetwork.name == "Devnet" ? "devnet" : "testnet";
   return {
     chain_name: meta.chain_name,
     status: meta.status,
-    network_type: "testnet",
+    network_type,
     pretty_name: meta.pretty_name,
     chain_id: meta.chain_id,
     chain_type: "cosmos",