diff --git a/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol b/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol
index 16ebcc950..e8d2acecd 100644
--- a/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol
+++ b/contracts/crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol
@@ -17,6 +17,11 @@ import "./LibArbitrumL2.sol";
  * this specialization of {CrossChainEnabled} does not include a constructor.
  *
  * _Available since v4.6._
+ *
+ * WARNING: There is currently a bug in Arbitrum that causes this contract to
+ * fail to detect cross-chain calls when deployed behind a proxy. This will be
+ * fixed when the network is upgraded to Arbitrum Nitro, currently scheduled for
+ * August 31st 2022.
  */
 abstract contract CrossChainEnabledArbitrumL2 is CrossChainEnabled {
     /**
diff --git a/contracts/crosschain/arbitrum/LibArbitrumL2.sol b/contracts/crosschain/arbitrum/LibArbitrumL2.sol
index 7ce2b15df..5f50b96a2 100644
--- a/contracts/crosschain/arbitrum/LibArbitrumL2.sol
+++ b/contracts/crosschain/arbitrum/LibArbitrumL2.sol
@@ -12,6 +12,11 @@ import "../errors.sol";
  *
  * This version should only be used on L2 to process cross-chain messages
  * originating from L1. For the other side, use {LibArbitrumL1}.
+ *
+ * WARNING: There is currently a bug in Arbitrum that causes this contract to
+ * fail to detect cross-chain calls when deployed behind a proxy. This will be
+ * fixed when the network is upgraded to Arbitrum Nitro, currently scheduled for
+ * August 31st 2022.
  */
 library LibArbitrumL2 {
     /**
diff --git a/docs/modules/api/pages/crosschain.adoc b/docs/modules/api/pages/crosschain.adoc
index c83cede54..65ae1d03b 100644
--- a/docs/modules/api/pages/crosschain.adoc
+++ b/docs/modules/api/pages/crosschain.adoc
@@ -2508,6 +2508,11 @@ this specialization of {CrossChainEnabled} does not include a constructor.
 
 _Available since v4.6._
 
+WARNING: There is currently a bug in Arbitrum that causes this contract to
+fail to detect cross-chain calls when deployed behind a proxy. This will be
+fixed when the network is upgraded to Arbitrum Nitro, currently scheduled for
+August 31st 2022.
+
 
 [.contract-index]
 .Functions
@@ -2804,6 +2809,11 @@ https://arbitrum.io/[Arbitrum].
 This version should only be used on L2 to process cross-chain messages
 originating from L1. For the other side, use {LibArbitrumL1}.
 
+WARNING: There is currently a bug in Arbitrum that causes this contract to
+fail to detect cross-chain calls when deployed behind a proxy. This will be
+fixed when the network is upgraded to Arbitrum Nitro, currently scheduled for
+August 31st 2022.
+
 
 [.contract-index]
 .Functions