diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index a90d8e46b8..aef55bbf63 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit a90d8e46b87ea026182b97d8311dafc15c577714
+Subproject commit aef55bbf636ed580d4d6408a5c2e75d1f70a875e
diff --git a/components/esp_common/include/esp_err.h b/components/esp_common/include/esp_err.h
index 28f98c9207..af1f2d6d34 100644
--- a/components/esp_common/include/esp_err.h
+++ b/components/esp_common/include/esp_err.h
@@ -129,7 +129,7 @@ void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int l
  * serial output.
  * In comparison with ESP_ERROR_CHECK(), this prints the same error message but isn't terminating the program.
  */
-#ifdef NDEBUG
+#if defined NDEBUG || defined CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT
 #define ESP_ERROR_CHECK_WITHOUT_ABORT(x) ({                                         \
         esp_err_t __err_rc = (x);                                                   \
         __err_rc;                                                                   \