diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
index e8634913aa29..7dc792f7021f 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -21,4 +21,5 @@ net/bluetooth/hidp/hidp.ko
 net/mac80211/mac80211.ko
 net/tipc/tipc.ko
 net/tipc/diag.ko
+net/rfkill/rfkill.ko
 net/nfc/nfc.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 9d493a230254..21464f7a7b80 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -19,6 +19,7 @@ net/can/can-gw.ko
 net/can/can-raw.ko
 net/mac80211/mac80211.ko
 net/nfc/nfc.ko
+net/rfkill/rfkill.ko
 net/tipc/diag.ko
 net/tipc/tipc.ko
 net/wireless/cfg80211.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index d31c604e8398..4746293d70ec 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -289,7 +289,7 @@ CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
-CONFIG_RFKILL=y
+CONFIG_RFKILL=m
 CONFIG_NFC=m
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index f379d5e60ca4..f0889af97015 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -270,7 +270,7 @@ CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
-CONFIG_RFKILL=y
+CONFIG_RFKILL=m
 CONFIG_NFC=m
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
diff --git a/modules.bzl b/modules.bzl
index 7401e4886e7a..e5fdb84c4674 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -21,6 +21,7 @@ COMMON_GKI_MODULES_LIST = [
     "net/can/can-raw.ko",
     "net/mac80211/mac80211.ko",
     "net/nfc/nfc.ko",
+    "net/rfkill/rfkill.ko",
     "net/tipc/diag.ko",
     "net/tipc/tipc.ko",
     "net/wireless/cfg80211.ko",