diff --git a/solidity/remappings.txt b/solidity/remappings.txt
index 49ae22c339..61bde863a7 100644
--- a/solidity/remappings.txt
+++ b/solidity/remappings.txt
@@ -2,6 +2,7 @@
 @eth-optimism=../node_modules/@eth-optimism
 @layerzerolabs=../node_modules/@layerzerolabs
 @openzeppelin=../node_modules/@openzeppelin
+@chainlink=../node_modules/@chainlink
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
 fx-portal/=lib/fx-portal/
diff --git a/typescript/sdk/src/ism/HyperlaneIsmFactory.ts b/typescript/sdk/src/ism/HyperlaneIsmFactory.ts
index 05e13b09ad..c161d9b858 100644
--- a/typescript/sdk/src/ism/HyperlaneIsmFactory.ts
+++ b/typescript/sdk/src/ism/HyperlaneIsmFactory.ts
@@ -243,14 +243,16 @@ export class HyperlaneIsmFactory extends HyperlaneApp<ProxyFactoryFactories> {
     config: CCIPIsmConfig,
   ): Promise<CCIPIsm> {
     const ccipChainSelector = getCCIPChainSelector(config.originChain);
-    const ccipRouterAddress = getCCIPRouterAddress(config.originChain);
+
+    // Get the CCIP router address to set it on the ISM so that it can call ccipReceive
+    const ccipRouterAddress = getCCIPRouterAddress(destination);
     assert(
       ccipChainSelector,
       `CCIP chain selector not found for ${config.originChain}`,
     );
     assert(
       ccipRouterAddress,
-      `CCIP router address not found for ${config.originChain}`,
+      `CCIP router address not found for ${destination}`,
     );
     return this.deployer.deployContract(destination, IsmType.CCIP, [
       ccipRouterAddress,