diff --git a/deposit_contract.sol b/deposit_contract.sol
index 93242c726..f4e36b225 100644
--- a/deposit_contract.sol
+++ b/deposit_contract.sol
@@ -75,6 +75,11 @@ contract DepositContract is IDepositContract {
         bytes calldata signature,
         bytes32 deposit_data_root
     ) override external payable {
+        // Extended ABI length checks since dynamic types are used.
+        require(pubkey.length == PUBKEY_LENGTH);
+        require(withdrawal_credentials.length == WITHDRAWAL_CREDENTIALS_LENGTH);
+        require(signature.length == SIGNATURE_LENGTH);
+
         // Avoid overflowing the Merkle tree (and prevent edge case in computing `branch`)
         require(deposit_count < MAX_DEPOSIT_COUNT);
 
@@ -84,11 +89,6 @@ contract DepositContract is IDepositContract {
         uint deposit_amount = msg.value / GWEI;
         require(deposit_amount < 2**64);
 
-        // Length checks for safety
-        require(pubkey.length == PUBKEY_LENGTH);
-        require(withdrawal_credentials.length == WITHDRAWAL_CREDENTIALS_LENGTH);
-        require(signature.length == SIGNATURE_LENGTH);
-
         // Emit `DepositEvent` log
         bytes memory amount = to_little_endian_64(uint64(deposit_amount));
         emit DepositEvent(