diff --git a/core/src/wlan_p2p_main.c b/core/src/wlan_p2p_main.c
index 96d472b510b8..e77a16cc6293 100644
--- a/core/src/wlan_p2p_main.c
+++ b/core/src/wlan_p2p_main.c
@@ -297,7 +297,7 @@ static QDF_STATUS p2p_vdev_obj_destroy_notification(
 static QDF_STATUS p2p_send_noa_to_pe(struct p2p_noa_info *noa_info)
 {
 	struct p2p_noa_attr *noa_attr;
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 
 	if (!noa_info) {
 		p2p_err("noa info is null");
diff --git a/dispatcher/src/wlan_p2p_tgt_api.c b/dispatcher/src/wlan_p2p_tgt_api.c
index b72e52894315..3756a8d733d5 100644
--- a/dispatcher/src/wlan_p2p_tgt_api.c
+++ b/dispatcher/src/wlan_p2p_tgt_api.c
@@ -127,7 +127,7 @@ QDF_STATUS tgt_p2p_mgmt_ota_comp_cb(void *context, qdf_nbuf_t buf,
 	struct p2p_tx_conf_event *tx_conf_event;
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct tx_action_context *tx_ctx;
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 
 	p2p_debug("context:%p, buf:%p, status:%d, tx complete params:%p",
 		context, buf, status, tx_compl_params);
@@ -176,7 +176,7 @@ QDF_STATUS tgt_p2p_mgmt_frame_rx_cb(struct wlan_objmgr_psoc *psoc,
 	struct p2p_rx_mgmt_frame *rx_mgmt;
 	struct p2p_rx_mgmt_event *rx_mgmt_event;
 	struct p2p_soc_priv_obj *p2p_soc_obj;
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 	struct wlan_frame_hdr *wh;
 	struct wlan_objmgr_vdev *vdev;
 	struct p2p_roc_context *roc_ctx;
@@ -257,7 +257,7 @@ QDF_STATUS  tgt_p2p_noa_event_cb(struct wlan_objmgr_psoc *psoc,
 		struct p2p_noa_info *event_info)
 {
 	struct p2p_noa_event *noa_event;
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 
 	p2p_debug("soc:%p, event_info:%p", psoc, event_info);
@@ -304,7 +304,7 @@ QDF_STATUS tgt_p2p_lo_event_cb(struct wlan_objmgr_psoc *psoc,
 		struct p2p_lo_event *event_info)
 {
 	struct p2p_lo_stop_event *lo_stop_event;
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 
 	p2p_debug("soc:%p, event_info:%p", psoc, event_info);
diff --git a/dispatcher/src/wlan_p2p_ucfg_api.c b/dispatcher/src/wlan_p2p_ucfg_api.c
index 977a514b96d3..543ef5417f8d 100644
--- a/dispatcher/src/wlan_p2p_ucfg_api.c
+++ b/dispatcher/src/wlan_p2p_ucfg_api.c
@@ -69,7 +69,7 @@ QDF_STATUS ucfg_p2p_psoc_stop(struct wlan_objmgr_psoc *soc)
 QDF_STATUS ucfg_p2p_roc_req(struct wlan_objmgr_psoc *soc,
 	struct p2p_roc_req *roc_req, uint64_t *cookie)
 {
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct p2p_roc_context *roc_ctx;
 
@@ -114,7 +114,7 @@ QDF_STATUS ucfg_p2p_roc_req(struct wlan_objmgr_psoc *soc,
 QDF_STATUS ucfg_p2p_roc_cancel_req(struct wlan_objmgr_psoc *soc,
 	uint64_t cookie)
 {
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct cancel_roc_context *cancel_roc;
 
@@ -151,7 +151,7 @@ QDF_STATUS ucfg_p2p_roc_cancel_req(struct wlan_objmgr_psoc *soc,
 QDF_STATUS ucfg_p2p_mgmt_tx(struct wlan_objmgr_psoc *soc,
 	struct p2p_mgmt_tx *mgmt_frm, uint64_t *cookie)
 {
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct  tx_action_context *tx_action;
 
@@ -210,7 +210,7 @@ QDF_STATUS ucfg_p2p_mgmt_tx(struct wlan_objmgr_psoc *soc,
 QDF_STATUS ucfg_p2p_mgmt_tx_cancel(struct wlan_objmgr_psoc *soc,
 	uint64_t cookie)
 {
-	struct scheduler_msg msg;
+	struct scheduler_msg msg = {0};
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct cancel_roc_context *cancel_tx;