diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp48.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp48.c
index ffcd88dc44f3..a792404c243c 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp48.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp48.c
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/ratelimit.h>
+#include <linux/clk/msm-clk.h>
 
 #include "msm_isp_util.h"
 #include "msm_isp_axi_util.h"
@@ -198,6 +199,18 @@ static int msm_vfe48_get_clks(struct vfe_device *vfe_dev)
 		if (strcmp(vfe_dev->vfe_clk_info[i].clk_name,
 					"mnoc_maxi_clk") == 0)
 			vfe_dev->vfe_clk_info[i].clk_rate = INIT_RATE;
+		/* set no memory retention */
+		if (strcmp(vfe_dev->vfe_clk_info[i].clk_name,
+				"camss_vfe_clk") == 0 ||
+			strcmp(vfe_dev->vfe_clk_info[i].clk_name,
+				"camss_csi_vfe_clk") == 0 ||
+			strcmp(vfe_dev->vfe_clk_info[i].clk_name,
+				"camss_vfe_vbif_axi_clk") == 0) {
+			msm_camera_set_clk_flags(vfe_dev->vfe_clk[i],
+				 CLKFLAG_NORETAIN_MEM);
+			msm_camera_set_clk_flags(vfe_dev->vfe_clk[i],
+				 CLKFLAG_NORETAIN_PERIPH);
+		}
 	}
 	return 0;
 }