diff --git a/contracts/Arbitrator.sol b/contracts/Arbitrator.sol
index 297d244..b63e1ce 100644
--- a/contracts/Arbitrator.sol
+++ b/contracts/Arbitrator.sol
@@ -6,6 +6,7 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 import {DoubleEndedQueueUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/structs/DoubleEndedQueueUpgradeable.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {IArbitrator} from "./interfaces/IArbitrator.sol";
 import {IL1Gateway} from "./interfaces/IL1Gateway.sol";
 import {IAdmin} from "./zksync/l1-contracts/zksync/interfaces/IAdmin.sol";
@@ -200,12 +201,7 @@ contract Arbitrator is IArbitrator, OwnableUpgradeable, UUPSUpgradeable, Reentra
         }
         // Call the claim interface of source chain message service
         // And it will inner call the `claimCallback` interface of source chain L1Gateway
-        (bool success, bytes memory returnData) = _sourceChainCanonicalMessageService.call(_sourceChainClaimCallData);
-        if (!success) {
-            // Propagate an error if the call fails.
-            assembly {
-                revert(add(returnData, 0x20), mload(returnData))
-            }
-        }
+        // No use of return value
+        Address.functionCall(_sourceChainCanonicalMessageService, _sourceChainClaimCallData);
     }
 }
diff --git a/contracts/dev-contracts/DummyArbitrator.sol b/contracts/dev-contracts/DummyArbitrator.sol
index 0d88537..6bd8a3f 100644
--- a/contracts/dev-contracts/DummyArbitrator.sol
+++ b/contracts/dev-contracts/DummyArbitrator.sol
@@ -34,11 +34,7 @@ contract DummyArbitrator is IArbitrator, OwnableUpgradeable, UUPSUpgradeable, Re
         _gateway.sendMessage{value: msg.value + _value}(_value, _callData, _adapterParams);
     }
 
-    function claimMessage(
-        address,
-        bytes calldata,
-        bytes memory
-    ) external payable {
+    function claimMessage(address, bytes calldata, bytes memory) external payable {
         // do nothing
     }
 }
diff --git a/hardhat.base.config.js b/hardhat.base.config.js
index 5c08e70..aded78c 100644
--- a/hardhat.base.config.js
+++ b/hardhat.base.config.js
@@ -16,18 +16,18 @@ const hardhatUserConfig = {
       },
     ],
     overrides: {
-      "contracts/Arbitrator.sol": {
-        version: "0.8.25",
+      'contracts/Arbitrator.sol': {
+        version: '0.8.25',
         settings: {
           viaIR: true,
           optimizer: {
             enabled: true,
             runs: 200,
           },
-          evmVersion: "cancun",
+          evmVersion: 'cancun',
         },
-      }
-    }
+      },
+    },
   },
   networks: {
     hardhat: {