diff --git a/system-contracts/contracts/EvmInterpreterFunctions.template.yul b/system-contracts/contracts/EvmInterpreterFunctions.template.yul
index fcf65915a..bdf2a5453 100644
--- a/system-contracts/contracts/EvmInterpreterFunctions.template.yul
+++ b/system-contracts/contracts/EvmInterpreterFunctions.template.yul
@@ -962,8 +962,15 @@ function performStaticCall(oldSp,evmGasLeft) -> extraCost, sp {
         }
     }
 
-    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-    extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+    let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+    switch iszero(precompileCost)
+    case 1 {
+        extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+    }
+    default {
+        extraCost := add(extraCost, precompileCost)
+    }
+
     sp := pushStackItem(sp, success, evmGasLeft)
 }
 function capGas(evmGasLeft,oldGasToPass) -> gasToPass {
@@ -1086,8 +1093,14 @@ function performCall(oldSp, evmGasLeft, isStatic) -> extraCost, sp {
         isStatic
     )
 
-    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-    extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+    let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+    switch iszero(precompileCost)
+    case 1 {
+        extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+    }
+    default {
+        extraCost := add(extraCost, precompileCost)
+    }
     sp := pushStackItem(sp,success, evmGasLeft) 
 }
 
@@ -1150,8 +1163,14 @@ function delegateCall(oldSp, oldIsStatic, evmGasLeft) -> sp, isStatic, extraCost
 
     _popEVMFrame()
 
-    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-    extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+    let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+    switch iszero(precompileCost)
+    case 1 {
+        extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+    }
+    default {
+        extraCost := add(extraCost, precompileCost)
+    }
     sp := pushStackItem(sp, success, evmGasLeft)
 }
 
diff --git a/system-contracts/contracts/EvmInterpreterPreprocessed.yul b/system-contracts/contracts/EvmInterpreterPreprocessed.yul
index 2780a9625..096a3e2aa 100644
--- a/system-contracts/contracts/EvmInterpreterPreprocessed.yul
+++ b/system-contracts/contracts/EvmInterpreterPreprocessed.yul
@@ -1036,8 +1036,15 @@ object "EVMInterpreter" {
                 }
             }
         
-            extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-            extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+            let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+            switch iszero(precompileCost)
+            case 1 {
+                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+            }
+            default {
+                extraCost := add(extraCost, precompileCost)
+            }
+        
             sp := pushStackItem(sp, success, evmGasLeft)
         }
         function capGas(evmGasLeft,oldGasToPass) -> gasToPass {
@@ -1160,8 +1167,14 @@ object "EVMInterpreter" {
                 isStatic
             )
         
-            extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-            extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+            let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+            switch iszero(precompileCost)
+            case 1 {
+                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+            }
+            default {
+                extraCost := add(extraCost, precompileCost)
+            }
             sp := pushStackItem(sp,success, evmGasLeft) 
         }
         
@@ -1224,8 +1237,14 @@ object "EVMInterpreter" {
         
             _popEVMFrame()
         
-            extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-            extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+            let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+            switch iszero(precompileCost)
+            case 1 {
+                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+            }
+            default {
+                extraCost := add(extraCost, precompileCost)
+            }
             sp := pushStackItem(sp, success, evmGasLeft)
         }
         
@@ -4031,8 +4050,15 @@ object "EVMInterpreter" {
                     }
                 }
             
-                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-                extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+                let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+                switch iszero(precompileCost)
+                case 1 {
+                    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+                }
+                default {
+                    extraCost := add(extraCost, precompileCost)
+                }
+            
                 sp := pushStackItem(sp, success, evmGasLeft)
             }
             function capGas(evmGasLeft,oldGasToPass) -> gasToPass {
@@ -4155,8 +4181,14 @@ object "EVMInterpreter" {
                     isStatic
                 )
             
-                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-                extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+                let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+                switch iszero(precompileCost)
+                case 1 {
+                    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+                }
+                default {
+                    extraCost := add(extraCost, precompileCost)
+                }
                 sp := pushStackItem(sp,success, evmGasLeft) 
             }
             
@@ -4219,8 +4251,14 @@ object "EVMInterpreter" {
             
                 _popEVMFrame()
             
-                extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
-                extraCost := add(extraCost, getGasForPrecompiles(addr, argsOffset, argsSize))
+                let precompileCost := getGasForPrecompiles(addr, argsOffset, argsSize)
+                switch iszero(precompileCost)
+                case 1 {
+                    extraCost := add(extraCost,sub(gasToPass,frameGasLeft))
+                }
+                default {
+                    extraCost := add(extraCost, precompileCost)
+                }
                 sp := pushStackItem(sp, success, evmGasLeft)
             }