diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 4720d6cfaf..49dddc0795 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -729,8 +729,10 @@ int sde_connector_pre_kickoff(struct drm_connector *connector)
 	 * in pre-kickoff. This flag must be reset at the
 	 * end of display pre-kickoff.
 	 */
-	display = (struct dsi_display *)c_conn->display;
-	display->queue_cmd_waits = true;
+	if (c_conn->connector_type == DRM_MODE_CONNECTOR_DSI) {
+		display = (struct dsi_display *)c_conn->display;
+		display->queue_cmd_waits = true;
+	}
 
 	rc = _sde_connector_update_dirty_properties(connector);
 	if (rc) {
@@ -748,7 +750,8 @@ int sde_connector_pre_kickoff(struct drm_connector *connector)
 
 	rc = c_conn->ops.pre_kickoff(connector, c_conn->display, &params);
 
-	display->queue_cmd_waits = false;
+	if (c_conn->connector_type == DRM_MODE_CONNECTOR_DSI)
+		display->queue_cmd_waits = false;
 end:
 	return rc;
 }