diff --git a/core/vm/evm.go b/core/vm/evm.go
index 88ef1cf121e..8975c791c84 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -601,7 +601,9 @@ func (evm *EVM) initNewContract(contract *Contract, address common.Address) ([]b
 		}
 	}
 
-	evm.StateDB.SetCode(address, ret, tracing.CodeChangeContractCreation)
+	if len(ret) > 0 {
+		evm.StateDB.SetCode(address, ret, tracing.CodeChangeContractCreation)
+	}
 	return ret, nil
 }