diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index ef82867..a3b1fe3 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -1388,6 +1388,16 @@
 	uint8_t mux_flags;
 	struct stopwatch sw;
 
+	if (!google_chromeec_check_feature(EC_FEATURE_TYPEC_REQUIRE_AP_MODE_ENTRY)) {
+		google_chromeec_usb_get_pd_mux_info(port, &mux_flags);
+		if (!(mux_flags & USB_PD_MUX_HPD_LVL) || !(mux_flags & USB_PD_MUX_DP_ENABLED)) {
+			printk(BIOS_WARNING, "DP/HPD not ready. Abort.\n");
+			return -1;
+		}
+
+		return 0;
+	}
+
 	stopwatch_init_msecs_expire(&sw, timeout_ms);
 	do {
 		google_chromeec_usb_get_pd_mux_info(port, &mux_flags);