diff --git a/dependencies/CMakeLists-mbedtls.txt.in b/dependencies/CMakeLists-mbedtls.txt.in
index cb81adc8..12888d5b 100644
--- a/dependencies/CMakeLists-mbedtls.txt.in
+++ b/dependencies/CMakeLists-mbedtls.txt.in
@@ -14,7 +14,7 @@ include(ExternalProject)
 ExternalProject_Add(
         mbedtls
         GIT_REPOSITORY        "https://github.com/ARMmbed/mbedtls.git"
-        GIT_TAG               "v2.25.0" # Reset to origin/master if issue https://github.com/ARMmbed/mbedtls/issues/4233 if fixed
+        GIT_TAG               origin/master
         BUILD_ALWAYS          OFF
         DOWNLOAD_DIR          "${DOWNLOAD_DIR}"
         SOURCE_DIR            "${SOURCE_DIR}"
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
index f37aa83a..318787de 100644
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -233,7 +233,7 @@ if (NOT USE_SYSTEM_MBEDTLS_LIBS)
 		FetchContent_Declare(
 			mbedtls
 			GIT_REPOSITORY        https://github.com/ARMmbed/mbedtls.git
-			GIT_TAG               "v2.25.0" # Reset to origin/master if issue https://github.com/ARMmbed/mbedtls/issues/4233 if fixed
+			GIT_TAG               origin/master
 			BUILD_ALWAYS          OFF
 			GIT_PROGRESS          1
 			DOWNLOAD_DIR          "${MBEDTLS_DOWNLOAD_DIR}"