diff --git a/net/qrtr/gunyah.c b/net/qrtr/gunyah.c
index 01942d5a6fd1..3dc243b90662 100644
--- a/net/qrtr/gunyah.c
+++ b/net/qrtr/gunyah.c
@@ -496,7 +496,7 @@ static int qrtr_gunyah_share_mem(struct qrtr_gunyah_dev *qdev, gh_vmid_t self,
 	sgl->sgl_entries[0].ipa_base = qdev->res.start;
 	sgl->sgl_entries[0].size = resource_size(&qdev->res);
 
-	ret = ghd_rm_mem_share(GH_RM_MEM_TYPE_NORMAL, 0, qdev->label,
+	ret = ghd_rm_mem_share(GH_RM_MEM_TYPE_NORMAL, GH_RM_MEM_SHARE_SANITIZE, qdev->label,
 			       acl, sgl, NULL, &qdev->memparcel);
 	if (ret) {
 		pr_err("%s: gh_rm_mem_share failed addr=%x size=%u err=%d\n",
@@ -594,9 +594,6 @@ static void qrtr_gunyah_fifo_init(struct qrtr_gunyah_dev *qdev)
 {
 	__le32 *descs;
 
-	if (qdev->master)
-		memset(qdev->base, 0, sizeof(*descs) * 10);
-
 	descs = qdev->base;
 	descs[GUNYAH_MAGIC_IDX] = GUNYAH_MAGIC_KEY;