diff --git a/driver/platform/waipio/src/msm_vidc_waipio.c b/driver/platform/waipio/src/msm_vidc_waipio.c
index 1d9b4b2e20..35c78bf958 100644
--- a/driver/platform/waipio/src/msm_vidc_waipio.c
+++ b/driver/platform/waipio/src/msm_vidc_waipio.c
@@ -595,7 +595,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 		HFI_PROP_MAX_QP_PACKED,
 		CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT,
 		{0}, {0},
-		NULL, msm_vidc_set_min_qp},
+		NULL, msm_vidc_set_max_qp},
 
 	{MAX_FRAME_QP, ENC, HEVC|HEIC,
 		MIN_QP_10BIT, MAX_QP, 1, MAX_QP,
@@ -603,7 +603,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 		HFI_PROP_MAX_QP_PACKED,
 		CAP_FLAG_OUTPUT_PORT,
 		{PIX_FMTS}, {0},
-		msm_vidc_adjust_hevc_max_qp, msm_vidc_set_min_qp},
+		msm_vidc_adjust_hevc_max_qp, msm_vidc_set_max_qp},
 
 	{I_FRAME_MAX_QP, ENC, H264,
 		MIN_QP_8BIT, MAX_QP, 1, MAX_QP,
diff --git a/driver/vidc/src/msm_vidc_control.c b/driver/vidc/src/msm_vidc_control.c
index 5084cc493e..22d6e12cdb 100644
--- a/driver/vidc/src/msm_vidc_control.c
+++ b/driver/vidc/src/msm_vidc_control.c
@@ -1829,11 +1829,11 @@ int msm_vidc_set_max_qp(void *instance,
 		capability->cap[MAX_FRAME_QP].flags & CAP_FLAG_CLIENT_SET;
 
 	i_qp_enable = max_qp_enable ||
-		capability->cap[I_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET;
+		capability->cap[I_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET;
 	p_qp_enable = max_qp_enable ||
-		capability->cap[P_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET;
+		capability->cap[P_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET;
 	b_qp_enable = max_qp_enable ||
-		capability->cap[B_FRAME_MIN_QP].flags & CAP_FLAG_CLIENT_SET;
+		capability->cap[B_FRAME_MAX_QP].flags & CAP_FLAG_CLIENT_SET;
 
 	client_qp_enable = i_qp_enable | p_qp_enable << 1 | b_qp_enable << 2;
 	if (!client_qp_enable) {