diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index 2a3d838..a4640b1 100644
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -99,7 +99,7 @@
 	 * an exception would occur during context save/restore if enabled but
 	 * not supported.
 	 */
-	assert(is_feat_hcx_present());
+	assert(is_feat_hcx_supported());
 #endif /* ENABLE_FEAT_HCX */
 
 #if CTX_INCLUDE_PAUTH_REGS
diff --git a/common/feat_detect.c b/common/feat_detect.c
index 9544b4f..a8c40f7 100644
--- a/common/feat_detect.c
+++ b/common/feat_detect.c
@@ -228,16 +228,6 @@
 #endif
 }
 
-/******************************************************************
- * Feature : FEAT_HCX (Extended Hypervisor Configuration Register)
- *****************************************************************/
-static void read_feat_hcx(void)
-{
-#if (ENABLE_FEAT_HCX == FEAT_STATE_ALWAYS)
-	feat_detect_panic(is_feat_hcx_present(), "HCX");
-#endif
-}
-
 /**************************************************
  * Feature : FEAT_RME (Realm Management Extension)
  *************************************************/
@@ -341,7 +331,7 @@
 	read_feat_twed();
 
 	/* v8.7 features */
-	read_feat_hcx();
+	check_feature(ENABLE_FEAT_HCX, read_feat_hcx_id_field(), "HCX");
 
 	/* v9.0 features */
 	read_feat_brbe();
diff --git a/include/arch/aarch64/arch_features.h b/include/arch/aarch64/arch_features.h
index e959708..2b801ac 100644
--- a/include/arch/aarch64/arch_features.h
+++ b/include/arch/aarch64/arch_features.h
@@ -173,10 +173,23 @@
 		ID_AA64PFR1_MPAM_FRAC_SHIFT) & ID_AA64PFR1_MPAM_FRAC_MASK));
 }
 
-static inline bool is_feat_hcx_present(void)
+static inline unsigned int read_feat_hcx_id_field(void)
+{
+	return (read_id_aa64mmfr1_el1() >> ID_AA64MMFR1_EL1_HCX_SHIFT) &
+		ID_AA64MMFR1_EL1_HCX_MASK;
+}
+
+static inline bool is_feat_hcx_supported(void)
 {
-	return (((read_id_aa64mmfr1_el1() >> ID_AA64MMFR1_EL1_HCX_SHIFT) &
-		ID_AA64MMFR1_EL1_HCX_MASK) == ID_AA64MMFR1_EL1_HCX_SUPPORTED);
+	if (ENABLE_FEAT_HCX == FEAT_STATE_DISABLED) {
+		return false;
+	}
+
+	if (ENABLE_FEAT_HCX == FEAT_STATE_ALWAYS) {
+		return true;
+	}
+
+	return read_feat_hcx_id_field() != 0U;
 }
 
 static inline bool is_feat_rng_trap_present(void)