diff --git a/components/mbedtls/CMakeLists.txt b/components/mbedtls/CMakeLists.txt
index 9fe882afe2..54d70e4655 100644
--- a/components/mbedtls/CMakeLists.txt
+++ b/components/mbedtls/CMakeLists.txt
@@ -357,11 +357,6 @@ foreach(target ${mbedtls_targets})
     endif()
 endforeach()
 
-if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 15.0)
-    target_compile_options(mbedtls PRIVATE "-Wno-unterminated-string-initialization")
-endif()
-
-
 if(CONFIG_MBEDTLS_DYNAMIC_BUFFER)
     set(WRAP_FUNCTIONS
         mbedtls_ssl_write_client_hello
diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
index 1bfd7a8374..eaaa0df986 100644
--- a/components/mbedtls/Kconfig
+++ b/components/mbedtls/Kconfig
@@ -368,8 +368,8 @@ menu "mbedTLS"
                 config keeps expired, retracted certificates in the bundle and it may
                 pose a security risk.
 
-                - Deprecated cert list may grow based based on sync with upstream bundle
-                - Deprecated certs would be be removed in ESP-IDF (next) major release
+                - Deprecated cert list may grow based on sync with upstream bundle
+                - Deprecated certs would be removed in ESP-IDF (next) major release
 
         config MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS
             int "Maximum no of certificates allowed in certificate bundle"