diff --git a/components/pmo/core/src/wlan_pmo_main.c b/components/pmo/core/src/wlan_pmo_main.c
index 886e1f0ea4..207aec3aa8 100644
--- a/components/pmo/core/src/wlan_pmo_main.c
+++ b/components/pmo/core/src/wlan_pmo_main.c
@@ -275,6 +275,8 @@ static void wlan_pmo_init_cfg(struct wlan_objmgr_psoc *psoc,
 	wlan_pmo_get_igmp_offload_enable_cfg(psoc, psoc_cfg);
 	psoc_cfg->disconnect_sap_tdls_in_wow =
 			cfg_get(psoc, CFG_DISCONNECT_SAP_TDLS_IN_WOW);
+	psoc_cfg->is_icmp_offload_enable =
+			cfg_get(psoc, CFG_ENABLE_ICMP_OFFLOAD);
 }
 
 QDF_STATUS pmo_psoc_open(struct wlan_objmgr_psoc *psoc)
diff --git a/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h b/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h
index 17dc48eb5d..64145567d6 100644
--- a/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h
+++ b/components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h
@@ -593,6 +593,25 @@
 		0, \
 		"disconnect sap tdls in wow")
 
+/*
+ * <ini>
+ * gEnableIcmpOffload - Enable/disable ICMP offload
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * This ini is used to enable/disable firmware's capability of sending ICMP
+ * response to clients.
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_ENABLE_ICMP_OFFLOAD CFG_INI_BOOL( \
+	"gEnableIcmpOffload", \
+	0, \
+	"enable/disable ICMP offload")
+
 #define CFG_PMO_COMMON_ALL \
 	CFG(CFG_ENABLE_SAP_SUSPEND) \
 	CFG(CFG_PMO_ENABLE_HOST_ARPOFFLOAD) \
@@ -617,6 +636,7 @@
 	CFG(CFG_ENABLE_BUS_SUSPEND_IN_GO_MODE)\
 	CFG(CFG_DISCONNECT_SAP_TDLS_IN_WOW) \
 	CFG(CFG_ENABLE_DYNAMIC_PCIE_GEN_SPEED_SWITCH) \
-	CFG(CFG_IGMP_VERSION_SUPPORT)
+	CFG(CFG_IGMP_VERSION_SUPPORT) \
+	CFG(CFG_ENABLE_ICMP_OFFLOAD)
 
 #endif /* WLAN_PMO_COMMON_CFG_H__ */
diff --git a/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
index 2a612837aa..69a360ef23 100644
--- a/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
+++ b/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
@@ -349,6 +349,8 @@ enum pmo_gpio_wakeup_mode {
  * @igmp_version_support: igmp version support
  * @igmp_offload_enable: enable/disable igmp offload feature to fw
  * @disconnect_sap_tdls_in_wow: sap/p2p_go disconnect or teardown tdls link
+ * @is_icmp_offload_enable: true if icmp offload is supported
+ *	for psoc else false
  */
 struct pmo_psoc_cfg {
 	bool ptrn_match_enable_all_vdev;
@@ -427,6 +429,7 @@ struct pmo_psoc_cfg {
 	bool igmp_offload_enable;
 #endif
 	bool disconnect_sap_tdls_in_wow;
+	bool is_icmp_offload_enable;
 };
 
 /**