diff --git a/authcrypt/mbed-os.lib b/authcrypt/mbed-os.lib
index 873ba2c53..f827c355f 100644
--- a/authcrypt/mbed-os.lib
+++ b/authcrypt/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#4c256f04596179699c4f14b6863b07cc024ca9be
+https://github.com/ARMmbed/mbed-os/#db4be94693c3a873cfa0c025a5ad2e62b86a8474
diff --git a/benchmark/mbed-os.lib b/benchmark/mbed-os.lib
index 873ba2c53..f827c355f 100644
--- a/benchmark/mbed-os.lib
+++ b/benchmark/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#4c256f04596179699c4f14b6863b07cc024ca9be
+https://github.com/ARMmbed/mbed-os/#db4be94693c3a873cfa0c025a5ad2e62b86a8474
diff --git a/hashing/mbed-os.lib b/hashing/mbed-os.lib
index 873ba2c53..f827c355f 100644
--- a/hashing/mbed-os.lib
+++ b/hashing/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#4c256f04596179699c4f14b6863b07cc024ca9be
+https://github.com/ARMmbed/mbed-os/#db4be94693c3a873cfa0c025a5ad2e62b86a8474
diff --git a/tls-client/mbed-os.lib b/tls-client/mbed-os.lib
index 873ba2c53..f827c355f 100644
--- a/tls-client/mbed-os.lib
+++ b/tls-client/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#4c256f04596179699c4f14b6863b07cc024ca9be
+https://github.com/ARMmbed/mbed-os/#db4be94693c3a873cfa0c025a5ad2e62b86a8474
diff --git a/tls-client/mbedtls_entropy_config.h b/tls-client/mbedtls_entropy_config.h
index 479077ad0..fa9fbd323 100644
--- a/tls-client/mbedtls_entropy_config.h
+++ b/tls-client/mbedtls_entropy_config.h
@@ -36,3 +36,7 @@
 #define MBEDTLS_MPI_MAX_SIZE        256
 
 #define MBEDTLS_MPI_WINDOW_SIZE     1
+
+#if defined(TARGET_STM32F439xI) && defined(MBEDTLS_CONFIG_HW_SUPPORT)
+#undef MBEDTLS_AES_ALT
+#endif /* TARGET_STM32F439xI && MBEDTLS_CONFIG_HW_SUPPORT */