diff --git a/configs/genoa.common b/configs/genoa.common
index c2ebabfcf38d..47463e9926ce 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -203,4 +203,11 @@ CONFIG_WMI_BCN_OFFLOAD := y
 
 #Flag to enable Supported Operating class
 CONFIG_HOST_OPCLASS := y
+
+#Enable VDEV STATE MACHINE
+CONFIG_CMN_VDEV_MLME_SM := y
+ifeq ($(CONFIG_CMN_VDEV_MLME_SM), y)
+#Enable STATE MACHINE HISTORY
+CONFIG_SM_ENG_HIST := n
+endif
 ###################################