diff --git a/Kbuild b/Kbuild
index 3dbe6a4f8b41..e74d20b78dca 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2021,6 +2021,8 @@ cppflags-$(CONFIG_QCOM_TDLS) += -DFEATURE_WLAN_TDLS
 
 cppflags-$(CONFIG_QCACLD_WLAN_LFR3) += -DWLAN_FEATURE_ROAM_OFFLOAD
 
+cppflags-$(CONFIG_WLAN_FEATURE_MBSSID) += -DWLAN_FEATURE_MBSSID
+
 cppflags-$(CONFIG_CNSS_GENL) += -DCNSS_GENL
 
 cppflags-$(CONFIG_QCACLD_WLAN_LFR2) += -DWLAN_FEATURE_HOST_ROAM
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 423aa6488303..1c01c1334d51 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -91,7 +91,7 @@ ifeq ($(CONFIG_ARCH_QCS405), y)
 	CONFIG_WLAN_SYNC_TSF_PLUS_NOIRQ := y
 	CONFIG_RX_PERFORMANCE := y
 endif
-
+CONFIG_WLAN_FEATURE_MBSSID := y
 #Flag to enable Legacy Fast Roaming2(LFR2)
 CONFIG_QCACLD_WLAN_LFR2 := y
 #Flag to enable Legacy Fast Roaming3(LFR3)