diff --git a/libs/webb-ui-components/src/components/ChainChip/ChainChip.tsx b/libs/webb-ui-components/src/components/ChainChip/ChainChip.tsx
index 4aa4487fc..248c5d8cf 100644
--- a/libs/webb-ui-components/src/components/ChainChip/ChainChip.tsx
+++ b/libs/webb-ui-components/src/components/ChainChip/ChainChip.tsx
@@ -55,7 +55,11 @@ export const ChainChip = React.forwardRef<HTMLSpanElement, ChainChipProps>(
             ? 'linea'
             : chainName.toLowerCase().includes('bnb')
               ? 'bsc'
-              : chainName,
+              : chainName.toLowerCase().includes('op')
+                ? 'optimism'
+                : chainName.toLowerCase().includes('arbitrum')
+                  ? 'arbitrum'
+                  : chainName,
       [chainName],
     );
 
@@ -70,7 +74,11 @@ export const ChainChip = React.forwardRef<HTMLSpanElement, ChainChipProps>(
         ? 'BSC'
         : chainName.toLowerCase().includes('linea')
           ? 'Linea'
-          : chainName.split(' ').pop();
+          : chainName.toLowerCase().includes('op')
+            ? 'Optimism'
+            : chainName.toLowerCase().includes('arbitrum')
+              ? 'Arbitrum'
+              : chainName.split(' ').pop();
     }, [chainName]);
 
     return (