diff --git a/Projects/FreeRTOS/CLI/nRF52840DK/project_CLI.cmake b/Projects/FreeRTOS/CLI/nRF52840DK/project_CLI.cmake
index 0000000..0000000 100644
--- a/Projects/FreeRTOS/CLI/nRF52840DK/project_CLI.cmake
+++ b/Projects/FreeRTOS/CLI/nRF52840DK/project_CLI.cmake
@@ -29,8 +29,8 @@ set(PROJECT_ARCH "m4")
 set(PROJECT_FP "hard")
 set(PROJECT_FPU "fpv4-sp-d16")
 
-set(USE_DRV_DW3000 0)
+set(USE_DRV_DW3000 1)
-set(USE_DRV_DW3720 1)
+set(USE_DRV_DW3720 0)
 
 if(USE_DRV_DW3000 AND USE_DRV_DW3720)
diff --git a/Projects/FreeRTOS/HelloWorld/nRF52840DK/project_HelloWorld.cmake b/Projects/FreeRTOS/HelloWorld/nRF52840DK/project_HelloWorld.cmake
index 0000000..0000000 100644
--- a/Projects/FreeRTOS/HelloWorld/nRF52840DK/project_HelloWorld.cmake
+++ b/Projects/FreeRTOS/HelloWorld/nRF52840DK/project_HelloWorld.cmake
@@ -24,8 +24,8 @@ set(PROJECT_ARCH "m4")
 set(PROJECT_FP "hard")
 set(PROJECT_FPU "fpv4-sp-d16")
 
-set(USE_DRV_DW3000 0)
+set(USE_DRV_DW3000 1)
-set(USE_DRV_DW3720 1)
+set(USE_DRV_DW3720 0)
 
 set(USE_CRYPTO_BACKEND_MBEDTLS 1)
diff --git a/Projects/FreeRTOS/QANI/nRF52840DK/project_QANI.cmake b/Projects/FreeRTOS/QANI/nRF52840DK/project_QANI.cmake
index 0000000..0000000 100644
--- a/Projects/FreeRTOS/QANI/nRF52840DK/project_QANI.cmake
+++ b/Projects/FreeRTOS/QANI/nRF52840DK/project_QANI.cmake
@@ -48,8 +48,8 @@ set(PROJECT_ARCH "m4")
 set(PROJECT_FP "hard")
 set(PROJECT_FPU "fpv4-sp-d16")
 
-set(USE_DRV_DW3000 0)
+set(USE_DRV_DW3000 1)
-set(USE_DRV_DW3720 1)
+set(USE_DRV_DW3720 0)
 
 set(USE_CRYPTO_BACKEND_MBEDTLS 1)
diff --git a/Projects/FreeRTOS/UCI/nRF52840DK/project_UCI.cmake b/Projects/FreeRTOS/UCI/nRF52840DK/project_UCI.cmake
index 0000000..0000000 100644
--- a/Projects/FreeRTOS/UCI/nRF52840DK/project_UCI.cmake
+++ b/Projects/FreeRTOS/UCI/nRF52840DK/project_UCI.cmake
@@ -34,8 +34,8 @@ set(PROJECT_FPU "fpv4-sp-d16")
 set(USE_CRYPTO_BACKEND_MBEDTLS 1)
 set(USE_CRYPTO_SPEED_OPTIMIZATION 0)
 
-set(USE_DRV_DW3000 0)
+set(USE_DRV_DW3000 1)
-set(USE_DRV_DW3720 1)
+set(USE_DRV_DW3720 0)
 
 if(USE_DRV_DW3000 AND USE_DRV_DW3720)
diff --git a/Src/Boards/Src/nRF52840DK/platform_l1_config.c b/Src/Boards/Src/nRF52840DK/platform_l1_config.c
index 0000000..0000000 100644
--- a/Src/Boards/Src/nRF52840DK/platform_l1_config.c
+++ b/Src/Boards/Src/nRF52840DK/platform_l1_config.c
@@ -19,8 +19,9 @@
 #define QLOG_TAG "platform_l1_config"
 #include "qlog.h"
 
-#define PLATFORM_ID_QM33110 3 /* QM33110 (no PDOA) platform ID. */
-#define PLATFORM_ID_QM33120 2 /* QM33120 (with PDOA) platform ID. */
+#define PLATFORM_ID_DW3000  0 /* DW3000 platform ID. */
+#define PLATFORM_ID_QM33120 2 /* QM33120 (with PDOA) platform ID. */
+#define PLATFORM_ID_QM33110 3 /* QM33110 (no PDOA) platform ID. */
 
@@ -145,12 +146,18 @@ enum qerr l1_config_platform_ops_reset_to_default(void)
     otp_rev = val32 & 0xFF;
     platform_id = val32 >> 16;
 
-    if (platform_id == PLATFORM_ID_QM33120)
-        support_aoa = true;
-    else if (platform_id == PLATFORM_ID_QM33110)
-        support_aoa = false;
-    else
-        return QERR_SUCCESS;
+    switch (platform_id)
+    {
+        case PLATFORM_ID_QM33120:
+            support_aoa = true;
+            break;
+        case PLATFORM_ID_DW3000:
+        case PLATFORM_ID_QM33110:
+            support_aoa = false;
+            break;
+        default:
+            return QERR_SUCCESS;
+    }
 
     /* Set antenna 0 as TX antenna, RF1. */
     configure_antenna_path(0, TRANSCEIVER_TX, 1);