diff --git a/msm/vidc/msm_venc.c b/msm/vidc/msm_venc.c
index dffecc0ca4c3..f6887a0b48f5 100644
--- a/msm/vidc/msm_venc.c
+++ b/msm/vidc/msm_venc.c
@@ -4201,6 +4201,9 @@ int msm_venc_set_extradata(struct msm_vidc_inst *inst)
 		}
 	}
 
+	if(!msm_vidc_cvp_usage)
+		inst->prop.extradata_ctrls &= ~EXTRADATA_ENC_INPUT_CVP;
+
 	/* CVP extradata is common between user space and external CVP kernel to kernel.
 	   Hence, skipping here and will be set after msm_vidc_prepare_preprocess in start_streaming*/
 
diff --git a/msm/vidc/msm_vidc_common.c b/msm/vidc/msm_vidc_common.c
index 1e03c00711a4..f6b984f2dcc4 100644
--- a/msm/vidc/msm_vidc_common.c
+++ b/msm/vidc/msm_vidc_common.c
@@ -4211,7 +4211,7 @@ static void populate_frame_data(struct vidc_frame_data *data,
 		if (vbuf->flags & V4L2_BUF_FLAG_CODECCONFIG)
 			data->flags |= HAL_BUFFERFLAG_CODECCONFIG;
 
-		if(vbuf->flags & V4L2_BUF_FLAG_CVPMETADATA_SKIP)
+		if(msm_vidc_cvp_usage && (vbuf->flags & V4L2_BUF_FLAG_CVPMETADATA_SKIP))
 			data->flags |= HAL_BUFFERFLAG_CVPMETADATA_SKIP;
 
 		msm_comm_fetch_input_tag(&inst->etb_data, vb->index,