diff --git a/theme/src/theme/ChainId/index.tsx b/theme/src/theme/ChainId/index.tsx
index e77396f980a..5ba10746a8e 100644
--- a/theme/src/theme/ChainId/index.tsx
+++ b/theme/src/theme/ChainId/index.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { useEffect, useState } from 'react';
 import { Web3 } from 'web3';
 
@@ -16,5 +17,5 @@ export function ChainId(props: ChainIdProps) {
       .catch((error) => setValue(`Error: ${error.message}`));
   }, []);
 
-  return value;
+  return <>{value}</>;
 }
diff --git a/theme/src/theme/NetworkInfo/index.tsx b/theme/src/theme/NetworkInfo/index.tsx
index dc65261cbfc..1582c68e851 100644
--- a/theme/src/theme/NetworkInfo/index.tsx
+++ b/theme/src/theme/NetworkInfo/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { ChainId } from '../ChainId';
 
 function IOTA() {
   return (
@@ -100,7 +101,9 @@ function ShimmerEVM() {
         <tr>
           <td>Shimmer Token</td>
           <td>ISC / EVM</td>
-          <td>148</td>
+          <td>
+            <ChainId url='https://json-rpc.evm.shimmer.network' />
+          </td>
           <td>
             <a
               href='https://json-rpc.evm.shimmer.network'
@@ -217,7 +220,9 @@ function TestnetEVM() {
         <tr>
           <td>Testnet Tokens (no value)</td>
           <td>ISC / EVM</td>
-          <td>1073</td>
+          <td>
+            <ChainId url='https://json-rpc.evm.testnet.shimmer.network' />
+          </td>
           <td>
             <a
               href='https://json-rpc.evm.testnet.shimmer.network'