diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 4e623570cfff..9fc2877bcca2 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -93,7 +93,7 @@ static struct __qdf_device g_qdf_ctx;
 static uint8_t cds_multicast_logging;
 
 struct cds_hang_event_fixed_param {
-	uint32_t tlv_header;
+	uint16_t tlv_header;
 	uint8_t recovery_reason;
 	char driver_version[11];
 	char hang_event_version;
diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h
index 07e31277dc2b..d677f1b7f360 100644
--- a/core/dp/txrx/ol_txrx.h
+++ b/core/dp/txrx/ol_txrx.h
@@ -118,7 +118,7 @@ ol_tx_desc_pool_size_hl(struct cdp_cfg *ctrl_pdev);
 		(TXRX_HL_TX_DESC_HI_PRIO_RESERVED + 100)
 
 struct peer_hang_data {
-	uint32_t tlv_header;
+	uint16_t tlv_header;
 	uint8_t peer_mac_addr[QDF_MAC_ADDR_SIZE];
 	uint16_t peer_timeout_bitmask;
 } qdf_packed;
diff --git a/core/hdd/src/wlan_hdd_hang_event.c b/core/hdd/src/wlan_hdd_hang_event.c
index 2f0ab34a8003..745dcd9a6d0d 100644
--- a/core/hdd/src/wlan_hdd_hang_event.c
+++ b/core/hdd/src/wlan_hdd_hang_event.c
@@ -21,7 +21,7 @@
 #include <qdf_types.h>
 
 struct hdd_hang_event_fixed_param  {
-	uint32_t tlv_header;
+	uint16_t tlv_header;
 	uint8_t vdev_id;
 	uint8_t vdev_opmode;
 	uint8_t vdev_state;
@@ -29,7 +29,7 @@ struct hdd_hang_event_fixed_param  {
 } qdf_packed;
 
 struct hdd_scan_fixed_param {
-	uint32_t tlv_header;
+	uint16_t tlv_header;
 	uint8_t last_scan_reject_vdev_id;
 	enum scan_reject_states last_scan_reject_reason;
 	unsigned long last_scan_reject_timestamp;
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index c72d6fc70afd..4e18bb0bd9f1 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -79,7 +79,7 @@
 #include "wlan_pkt_capture_ucfg_api.h"
 
 struct pe_hang_event_fixed_param {
-	uint32_t tlv_header;
+	uint16_t tlv_header;
 	uint8_t vdev_id;
 	uint8_t limmlmstate;
 	uint8_t limprevmlmstate;