diff --git a/Zend/tests/enum/no-class-implements-backed-enum.phpt b/Zend/tests/enum/no-class-implements-backed-enum.phpt
index f6f37818da5ac..f8d4fd13a4239 100644
--- a/Zend/tests/enum/no-class-implements-backed-enum.phpt
+++ b/Zend/tests/enum/no-class-implements-backed-enum.phpt
@@ -7,4 +7,4 @@ class Foo implements BackedEnum {}
 
 ?>
 --EXPECTF--
-Fatal error: Non-enum class Foo cannot implement interface BackedEnum in %s on line %d
+Fatal error: Non-enum class Foo cannot implement interface UnitEnum in %s on line %d
diff --git a/Zend/tests/inheritance/enum_only_interfaces_error_via_indirect_interface.phpt b/Zend/tests/inheritance/enum_only_interfaces_error_via_indirect_interface.phpt
new file mode 100644
index 0000000000000..66a9215320550
--- /dev/null
+++ b/Zend/tests/inheritance/enum_only_interfaces_error_via_indirect_interface.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Interface that is extended from Enum only interface shouldn't be implementable by non-enum class
+--FILE--
+<?php
+interface I extends UnitEnum {}
+
+class C implements I {
+	public static function cases(): array {
+		return [];
+	}
+}
+
+?>
+--EXPECTF--
+Fatal error: Non-enum class C cannot implement interface UnitEnum in %s on line %d
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 9b3b6312cf255..572942c5aa9b7 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -2168,6 +2168,10 @@ static void do_interface_implementation(zend_class_entry *ce, zend_class_entry *
 	zend_class_constant *c;
 	uint32_t flags = ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY;
 
+	if (iface->num_interfaces) {
+		zend_do_inherit_interfaces(ce, iface);
+	}
+
 	if (!(ce->ce_flags & ZEND_ACC_INTERFACE)) {
 		/* We are not setting the prototype of overridden interface methods because of abstract
 		 * constructors. See Zend/tests/interface_constructor_prototype_001.phpt. */
@@ -2199,9 +2203,6 @@ static void do_interface_implementation(zend_class_entry *ce, zend_class_entry *
 	} ZEND_HASH_FOREACH_END();
 
 	do_implement_interface(ce, iface);
-	if (iface->num_interfaces) {
-		zend_do_inherit_interfaces(ce, iface);
-	}
 }
 /* }}} */