diff --git a/scripts/check-forbid-evm-reentrancy.sh b/scripts/check-forbid-evm-reentrancy.sh
index 9fa1e7d493..edd1f1966c 100755
--- a/scripts/check-forbid-evm-reentrancy.sh
+++ b/scripts/check-forbid-evm-reentrancy.sh
@@ -3,13 +3,24 @@
 while IFS= read -r path
 do
     echo "$path"
-    while IFS= read -r line
-    do
-        matches=$(echo "$line" | awk '(/^pallet-evm = / || /^pallet-ethereum = /) && !/reentrancy/');
-        if [ ! -z "$matches" ]; then
-            echo "Check fails: $line"
-            echo "Please add 'forbid-evm-reentrancy' feature to 'pallet-evm' and 'pallet-ethereum'."
-            exit 1
-        fi
-    done < "$path"
-done < <(find . -name "Cargo.toml" -not -path "*/target/*" -not -path "*/build/*")
\ No newline at end of file
+
+    # Detect single or multiline declarations of pallet-evm and pallet-ethereum to
+    # contain the "forbid-evm-reentrancy" feature.
+    matches=$(awk 'flag{
+      if (buf ~ /}/ && buf !~ /forbid-evm-reentrancy/) { 
+        printf "(line %d) %s", line, buf; flag=0; buf=""              # single line declaration
+      } else  {
+          buf = buf $0 ORS;
+          if (flag && /}/ && buf !~ /forbid-evm-reentrancy/) {        # multiline declaration
+            printf "(line %d) %s", line, buf; flag=0; buf="" 
+          }
+      }
+    }
+    /pallet-(ethereum|evm) = /{buf = $0 ORS; flag=1;line=NR}' "${path}") 
+
+    if [[ -n "$matches" ]]; then
+      echo "Check failed. Please add 'forbid-evm-reentrancy' feature to 'pallet-evm' and 'pallet-ethereum'."
+      echo "${matches}"
+      exit 1
+    fi
+done < <(find . -name "Cargo.toml" -not -path "*/target/*" -not -path "*/build/*")