diff --git a/cmsis/TARGET_CORTEX_M/mbed_tz_context.c b/cmsis/TARGET_CORTEX_M/mbed_tz_context.c
index 8e9541f75d..17bf625afe 100644
--- a/cmsis/TARGET_CORTEX_M/mbed_tz_context.c
+++ b/cmsis/TARGET_CORTEX_M/mbed_tz_context.c
@@ -22,6 +22,8 @@
  * limitations under the License.
  */
 
+#if !TARGET_TFM
+
 #if defined (__ARM_FEATURE_CMSE) &&  (__ARM_FEATURE_CMSE == 3U)
 
 #include "RTE_Components.h"
@@ -201,3 +203,5 @@ uint32_t TZ_StoreContext_S (TZ_MemoryId_t id) {
   return 1U;    // Success
 }
 #endif
+
+#endif // !TARGET_TFM
diff --git a/tools/importer/cmsis_importer.json b/tools/importer/cmsis_importer.json
index 0418913f64..0087d1acfe 100644
--- a/tools/importer/cmsis_importer.json
+++ b/tools/importer/cmsis_importer.json
@@ -150,7 +150,9 @@
       "287121ffdc4c9c19f9ce8872e4edd941862daca1",
       "b228cd9db0b7ed79d99f1d9be15d512791f367cc",
       "1752803626865147dca92f30a39cef8d04581736",
-      "6a6e3ac0ebab1a6b6aa08d0928702c79562acee9"
+      "6a6e3ac0ebab1a6b6aa08d0928702c79562acee9",
+      "fb354752eb69403ad503c8e53da67da6483776d6",
+      "d3f7abdb7c109517e6a71daed8bae63ad6436afc"
     ]
 }