diff --git a/contracts/upgradeable_contracts/arbitrary_message/MessageDelivery.sol b/contracts/upgradeable_contracts/arbitrary_message/MessageDelivery.sol
index 4aaacd7e3..ae2f0c192 100644
--- a/contracts/upgradeable_contracts/arbitrary_message/MessageDelivery.sol
+++ b/contracts/upgradeable_contracts/arbitrary_message/MessageDelivery.sol
@@ -14,7 +14,8 @@ contract MessageDelivery is BasicAMB {
     function getMinimumGasUsage(bytes _data) public pure returns (uint256 gas) {
         //From Ethereum Yellow Paper
         // 68 gas is paid for every non-zero byte of data or code for a transaction
-        return _data.length.mul(68);
+        // Starting from Istanbul hardfork, 16 gas is paid (EIP-2028)
+        return _data.length.mul(16);
     }
 
     /* solcov ignore next */