diff --git a/map-controller/Config.in b/map-controller/Config.in
index e3577f677..2f1c40ff9 100644
--- a/map-controller/Config.in
+++ b/map-controller/Config.in
@@ -10,6 +10,11 @@ config CONTROLLER_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
 	default y
 
+config CONTROLLER_PROVISION_DISABLED_AP
+	depends on CONTROLLER_EASYMESH_VENDOR_EXT
+	bool "Enable vendor extension that provisions disabled APs to agents"
+	default n
+
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	hex "Vendor OUI default"
 	default 0xB456FA
diff --git a/map-controller/Makefile b/map-controller/Makefile
index 583a14f34..0bb67b16b 100644
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -61,6 +61,9 @@ endif
 ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
+ifeq ($(CONFIG_CONTROLLER_PROVISION_DISABLED_AP),y)
+TARGET_CFLAGS += -DPROVISION_DISABLED_AP
+endif
 endif
 
 ifeq ($(CONFIG_CONTROLLER_PROPAGATE_PROBE_REQ),y)