diff --git a/connectivity/mbedtls/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt
index cac099b0a6e9..ae3f1b4e26fb 100644
--- a/connectivity/mbedtls/CMakeLists.txt
+++ b/connectivity/mbedtls/CMakeLists.txt
@@ -101,4 +101,6 @@ target_sources(mbed-mbedtls
 target_compile_definitions(mbed-mbedtls
     INTERFACE
         MBED_CONF_MBEDTLS_PRESENT=1
+        # workaround for https://github.com/ARMmbed/mbedtls/issues/1077
+        MULADDC_CANNOT_USE_R7
 )
diff --git a/tools/cmake/profiles/debug.cmake b/tools/cmake/profiles/debug.cmake
index 0c1d91810825..62f391dd2aaf 100644
--- a/tools/cmake/profiles/debug.cmake
+++ b/tools/cmake/profiles/debug.cmake
@@ -78,7 +78,6 @@ function(mbed_set_profile_options target mbed_toolchain)
         target_compile_definitions(${target}
             INTERFACE
                 __ASSERT_MSG
-                MULADDC_CANNOT_USE_R7
         )
     endif()