diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 210579f3928d..3f2af4540202 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -305,6 +305,7 @@ CONFIG_BT_HCIUART_QCA=y
 CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_CFG80211_CERTIFICATION_ONUS=y
+# CONFIG_CFG80211_REQUIRE_SIGNED_REGDB is not set
 CONFIG_CFG80211_REG_CELLULAR_HINTS=y
 CONFIG_MAC80211=m
 CONFIG_RFKILL=m
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 4d9bcae980f1..4aad17dcd0b6 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -303,6 +303,7 @@ CONFIG_BT_HCIUART_QCA=y
 CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_CFG80211_CERTIFICATION_ONUS=y
+# CONFIG_CFG80211_REQUIRE_SIGNED_REGDB is not set
 CONFIG_CFG80211_REG_CELLULAR_HINTS=y
 CONFIG_MAC80211=m
 CONFIG_RFKILL=m