diff --git a/drivers/media/platform/msm/cvp/msm_cvp_core.c b/drivers/media/platform/msm/cvp/msm_cvp_core.c
index 1fce69b97e0c..c7cf32fcc8a4 100644
--- a/drivers/media/platform/msm/cvp/msm_cvp_core.c
+++ b/drivers/media/platform/msm/cvp/msm_cvp_core.c
@@ -457,10 +457,10 @@ int msm_cvp_close(void *instance)
 		return -EINVAL;
 	}
 
-	msm_cvp_cleanup_instance(inst);
-
-	if (inst->session_type != MSM_CVP_BOOT)
+	if (inst->session_type != MSM_CVP_BOOT) {
+		msm_cvp_cleanup_instance(inst);
 		msm_cvp_session_deinit(inst);
+	}
 
 	rc = msm_cvp_comm_try_state(inst, MSM_CVP_CORE_UNINIT);
 	if (rc) {