diff --git a/src/config/data/ccip/data.ts b/src/config/data/ccip/data.ts
index ec6e6e8167e..1593ca7697f 100644
--- a/src/config/data/ccip/data.ts
+++ b/src/config/data/ccip/data.ts
@@ -204,7 +204,6 @@ export const networkFees: NetworkFees = {
   messaging: {
     fromToEthereum: { gasTokenFee: "0.50 USD", linkFee: "0.45 USD" },
     fromNonEthereumToNonEthereum: { gasTokenFee: "0.10 USD", linkFee: "0.09 USD" },
-    fromNonEthereumToSolana: { gasTokenFee: "0.10 USD", linkFee: "0.09 USD" },
   },
 }
 
diff --git a/src/content/ccip/billing.mdx b/src/content/ccip/billing.mdx
index eaafe7fcc56..f826067fb9c 100644
--- a/src/content/ccip/billing.mdx
+++ b/src/content/ccip/billing.mdx
@@ -110,11 +110,10 @@ For messaging (only data): The network fee is a static amount, denominated in US
 
 The table below provides an overview of the network fees charged for different use cases on different lanes. Percentage-based fees are calculated on the value transferred in a message. USD-denominated fees are applied per message.
 
-> **Note:** On the source side, "Not Ethereum" includes Solana. On the destination side, "Not Ethereum" excludes Solana.
+> **Note:** The following applies to **Token Transfers** and **Programmable Token Transfers**, not **Messaging**:
 >
-> <br></br>
-> When Solana is the destination for Token Transfers or Programmable Token Transfers, an additional fee of 0.10 USD
-> applies for [ATA](https://solana.com/docs/tokens#associated-token-account) generation.
+> - In the table below, "Not Ethereum" on the **source** side includes Solana; on the **destination** side it excludes Solana.
+> - When Solana is the destination, an additional 0.10 USD fee applies for [ATA](https://solana.com/docs/tokens#associated-token-account) generation.
 
 <Billing />
 
diff --git a/src/content/ccip/llms-full.txt b/src/content/ccip/llms-full.txt
index d92d5eae10c..9ac566c79c1 100644
--- a/src/content/ccip/llms-full.txt
+++ b/src/content/ccip/llms-full.txt
@@ -1132,10 +1132,10 @@ For messaging (only data): The network fee is a static amount, denominated in US
 
 The table below provides an overview of the network fees charged for different use cases on different lanes. Percentage-based fees are calculated on the value transferred in a message. USD-denominated fees are applied per message.
 
-> **Note:** On the source side, "Not Ethereum" includes Solana. On the destination side, "Not Ethereum" excludes Solana.
+> **Note:** The following applies to **Token Transfers** and **Programmable Token Transfers**, not **Messaging**:
 >
-> When Solana is the destination for Token Transfers or Programmable Token Transfers, an additional fee of 0.10 USD
-> applies for [ATA](https://solana.com/docs/tokens#associated-token-account) generation.
+> - In the table below, "Not Ethereum" on the **source** side includes Solana; on the **destination** side it excludes Solana.
+> - When Solana is the destination, an additional 0.10 USD fee applies for [ATA](https://solana.com/docs/tokens#associated-token-account) generation.
 
 <br id="network-token-calculator" />
 
diff --git a/src/features/ccip/components/billing/Billing.astro b/src/features/ccip/components/billing/Billing.astro
index 6834f7b0842..64af032f3c8 100644
--- a/src/features/ccip/components/billing/Billing.astro
+++ b/src/features/ccip/components/billing/Billing.astro
@@ -28,7 +28,6 @@ const restFromNonEthereumToSolana = calculateNetworkFeesForTokenMechanismDirect(
 )
 const messagingFeesFromToEthereum = calculateMessagingNetworkFeesDirect("fromToEthereum")
 const messagingFeesFromNonEthereumToNonEthereum = calculateMessagingNetworkFeesDirect("fromNonEthereumToNonEthereum")
-const messagingFeesFromNonEthereumToSolana = calculateMessagingNetworkFeesDirect("fromNonEthereumToSolana")
 ---
 
 <div style="overflow-x: auto;">
@@ -94,27 +93,15 @@ const messagingFeesFromNonEthereumToSolana = calculateMessagingNetworkFeesDirect
       </tr>
       <!-- Messaging -->
       <tr class="section-divider">
-        <td rowspan="5">Messaging</td>
-        <td rowspan="5">N/A</td>
+        <td rowspan="3">Messaging</td>
+        <td rowspan="3">N/A</td>
         <td>Ethereum</td>
-        <td>Not Ethereum</td>
-        <td>{messagingFeesFromToEthereum.linkFee}</td>
-        <td>{messagingFeesFromToEthereum.gasTokenFee}</td>
-      </tr>
-      <tr>
-        <td>Ethereum</td>
-        <td>Solana</td>
+        <td>Any</td>
         <td>{messagingFeesFromToEthereum.linkFee}</td>
         <td>{messagingFeesFromToEthereum.gasTokenFee}</td>
       </tr>
       <tr>
-        <td>Not Ethereum</td>
-        <td>Solana</td>
-        <td>{messagingFeesFromNonEthereumToSolana.linkFee}</td>
-        <td>{messagingFeesFromNonEthereumToSolana.gasTokenFee}</td>
-      </tr>
-      <tr>
-        <td>Not Ethereum</td>
+        <td>Any</td>
         <td>Ethereum</td>
         <td>{messagingFeesFromToEthereum.linkFee}</td>
         <td>{messagingFeesFromToEthereum.gasTokenFee}</td>