diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index 44a5bbb58c2..081879d9538 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit 44a5bbb58c22b3b6ad2b7773fc96b3a371fa22e6
+Subproject commit 081879d9538eaa7906a2cddd9ce86d76249bcefd
diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
index 494c358a221..54c854d66e2 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -15,8 +15,12 @@
  * attempt to use these macros without including this header will result in a
  * compiler error.
  */
+#ifndef MYNEWT_VAL
 #define MYNEWT_VAL(_name)                       MYNEWT_VAL_ ## _name
+#endif
+#ifndef MYNEWT_VAL_CHOICE
 #define MYNEWT_VAL_CHOICE(_name, _val)          MYNEWT_VAL_ ## _name ## __ ## _val
+#endif
 
 #ifndef IRAM_ATTR_64MCPU
 #define IRAM_ATTR_64MCPU IRAM_ATTR