diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 3ffd85d103..7fce2a0985 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -967,7 +967,8 @@ int dsi_display_check_status(struct drm_connector *connector, void *display,
 	status_mode = panel->esd_config.status_mode;
 
 	if ((status_mode == ESD_MODE_SW_SIM_SUCCESS) ||
-			(dsi_display->sw_te_using_wd))
+			(dsi_display->sw_te_using_wd) ||
+			(dsi_display->panel->te_using_watchdog_timer))
 		goto release_panel_lock;
 
 	if (status_mode == ESD_MODE_SW_SIM_FAILURE) {