diff --git a/hif/src/ce/ce_main.h b/hif/src/ce/ce_main.h
index 00ca3ec3e7..d287534364 100644
--- a/hif/src/ce/ce_main.h
+++ b/hif/src/ce/ce_main.h
@@ -301,7 +301,7 @@ struct ce_index {
  * @ce_info: CE info
  */
 struct hang_event_info {
-	uint32_t tlv_header;
+	uint16_t tlv_header;
 	uint8_t active_tasklet_count;
 	uint8_t active_grp_tasklet_cnt;
 	uint8_t ce_count;
diff --git a/htc/htc_credit_history.c b/htc/htc_credit_history.c
index 36b6831ebc..4f8d824b2b 100644
--- a/htc/htc_credit_history.c
+++ b/htc/htc_credit_history.c
@@ -31,7 +31,7 @@ struct HTC_CREDIT_HISTORY {
 };
 
 struct htc_hang_data_fixed_param {
-	uint32_t tlv_header;
+	uint16_t tlv_header;
 	struct HTC_CREDIT_HISTORY credit_hist;
 } qdf_packed;
 
diff --git a/wmi/src/wmi_hang_event.c b/wmi/src/wmi_hang_event.c
index 08f1bc33de..b23b533b07 100644
--- a/wmi/src/wmi_hang_event.c
+++ b/wmi/src/wmi_hang_event.c
@@ -20,7 +20,7 @@
 #include <qdf_trace.h>
 
 struct wmi_hang_data_fixed_param {
-	uint32_t tlv_header; /* tlv tag and length */
+	uint16_t tlv_header; /* tlv tag and length */
 	uint32_t event;
 	uint32_t data;
 	uint64_t time;