diff --git a/app/Kconfig b/app/Kconfig
index 5fc03822a02..f3b54a6b099 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -189,10 +189,6 @@ config BT_CTLR_PHY_2M
 config BT_TINYCRYPT_ECC
     default y if BT_HCI && !BT_CTLR
 
-config SYSTEM_WORKQUEUE_STACK_SIZE
-    default 4096 if SOC_RP2040
-    default 2048
-
 config ZMK_BLE_THREAD_STACK_SIZE
     int "BLE notify thread stack size"
     default 768
diff --git a/app/Kconfig.defaults b/app/Kconfig.defaults
index 02d845f1ba4..60e2657d64d 100644
--- a/app/Kconfig.defaults
+++ b/app/Kconfig.defaults
@@ -1,6 +1,10 @@
 # Copyright (c) 2024 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
+config SYSTEM_WORKQUEUE_STACK_SIZE
+    default 2048 if SOC_RP2040
+    default 2048 if ZMK_BLE
+
 # HID
 if ZMK_HID_REPORT_TYPE_HKRO