diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/VM.java b/ethereumj-core/src/main/java/org/ethereum/vm/VM.java
index 37101de763..7ac8aefdd6 100644
--- a/ethereumj-core/src/main/java/org/ethereum/vm/VM.java
+++ b/ethereumj-core/src/main/java/org/ethereum/vm/VM.java
@@ -1322,7 +1322,7 @@ else if (!currentValue.isZero() && newValue.isZero()) {
                     DataWord value = op.callHasValue() ?
                             program.stackPop() : DataWord.ZERO;
 
-                    if (program.isStaticCall() && op == CALL && !value.isZero())
+                    if (program.isStaticCall() && (op == CALL || op == CALLCODE) && !value.isZero())
                         throw new Program.StaticCallModificationException();
 
                     if (!value.isZero()) {