diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c
index 63ceed8e5bc8..ebdb65de1884 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -8465,15 +8465,17 @@ static QDF_STATUS extract_smartlog_event_non_tlv
 
 static bool is_management_record_non_tlv(uint32_t cmd_id)
 {
-	if ((cmd_id == WMI_BCN_TX_CMDID) ||
-		(cmd_id == WMI_PDEV_SEND_BCN_CMDID) ||
-		(cmd_id == WMI_MGMT_TX_CMDID) ||
-		(cmd_id == WMI_GPIO_OUTPUT_CMDID) ||
-		(cmd_id == WMI_HOST_SWBA_EVENTID)) {
+	switch (cmd_id) {
+	case WMI_BCN_TX_CMDID:
+	case WMI_MGMT_TX_CMDID:
+	case WMI_MGMT_RX_EVENTID:
+	case WMI_GPIO_OUTPUT_CMDID:
+	case WMI_HOST_SWBA_EVENTID:
+	case WMI_PDEV_SEND_BCN_CMDID:
 		return true;
+	default:
+		return false;
 	}
-
-	return false;
 }
 
 static bool is_diag_event_non_tlv(uint32_t event_id)
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index 75754885b87b..158e9abee876 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -20366,13 +20366,15 @@ static QDF_STATUS extract_peer_delete_response_event_tlv(wmi_unified_t wmi_hdl,
 
 static bool is_management_record_tlv(uint32_t cmd_id)
 {
-	if ((cmd_id == WMI_MGMT_TX_COMPLETION_EVENTID) ||
-			(cmd_id == WMI_MGMT_TX_SEND_CMDID) ||
-			(cmd_id == WMI_OFFCHAN_DATA_TX_SEND_CMDID)) {
+	switch (cmd_id) {
+	case WMI_MGMT_TX_SEND_CMDID:
+	case WMI_MGMT_TX_COMPLETION_EVENTID:
+	case WMI_OFFCHAN_DATA_TX_SEND_CMDID:
+	case WMI_MGMT_RX_EVENTID:
 		return true;
+	default:
+		return false;
 	}
-
-	return false;
 }
 
 static bool is_diag_event_tlv(uint32_t event_id)