diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 6ea7d1296e4..ea773ad28d8 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -1561,10 +1561,12 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
 
 				ZEND_ASSERT(orig_op_array != NULL);
 				if (orig_op_array != op_array) {
+					uint32_t fn_flags = op_array->fn_flags;
 					zend_function *prototype = op_array->prototype;
 					HashTable *ht = op_array->static_variables;
 
 					*op_array = *orig_op_array;
+					op_array->fn_flags = fn_flags;
 					op_array->prototype = prototype;
 					op_array->static_variables = ht;
 				}
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index b9576961ddc..8748cd6141b 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -3558,13 +3558,17 @@ static int preload_optimize(zend_persistent_script *script)
 			ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) {
 				if (op_array->fn_flags & ZEND_ACC_TRAIT_CLONE) {
 					zend_op_array *orig_op_array = zend_shared_alloc_get_xlat_entry(op_array->opcodes);
-					uint32_t fn_flags = op_array->fn_flags;
-					zend_function *prototype = op_array->prototype;
-					HashTable *ht = op_array->static_variables;
-					*op_array = *orig_op_array;
-					op_array->fn_flags = fn_flags;
-					op_array->prototype = prototype;
-					op_array->static_variables = ht;
+					if (orig_op_array) {
+						zend_class_entry *scope = op_array->scope;
+						uint32_t fn_flags = op_array->fn_flags;
+						zend_function *prototype = op_array->prototype;
+						HashTable *ht = op_array->static_variables;
+						*op_array = *orig_op_array;
+						op_array->scope = scope;
+						op_array->fn_flags = fn_flags;
+						op_array->prototype = prototype;
+						op_array->static_variables = ht;
+					}
 				}
 			} ZEND_HASH_FOREACH_END();
 		}