diff --git a/components/TARGET_PSA/mbed_lib.json b/components/TARGET_PSA/mbed_lib.json
index 985d9cd97d..b1087b13e8 100644
--- a/components/TARGET_PSA/mbed_lib.json
+++ b/components/TARGET_PSA/mbed_lib.json
@@ -1,3 +1,6 @@
 {
-    "name": "psa"
+    "name": "psa",
+    "config": {
+        "present": 1
+    }
 }
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.c
index fea3496c2c..39d02c73da 100644
--- a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.c
+++ b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.c
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+#if MBED_CONF_PSA_PRESENT
+
 #include "cmsis_nvic_virtual.h"
 #include "mbed_toolchain.h"
 
@@ -25,3 +27,5 @@ void __NVIC_TFMSystemReset(void)
 {
     mbed_psa_system_reset();
 }
+
+#endif // MBED_CONF_PSA_PRESENT
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.h b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.h
index bf8e94bda5..ae4bc530bc 100644
--- a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.h
+++ b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/device/cmsis_nvic_virtual.h
@@ -37,9 +37,14 @@ extern "C" {
 #define NVIC_GetActive              __NVIC_GetActive
 #define NVIC_SetPriority            __NVIC_SetPriority
 #define NVIC_GetPriority            __NVIC_GetPriority
+#if MBED_CONF_PSA_PRESENT
 #define NVIC_SystemReset            __NVIC_TFMSystemReset
+#else
+#define NVIC_SystemReset            __NVIC_SystemReset
+#endif // MBED_CONF_PSA_PRESENT
 
 
+#if MBED_CONF_PSA_PRESENT
 /**
  * \brief Overriding the default CMSIS system reset implementation by calling
  *        secure TFM service.
@@ -47,6 +52,8 @@ extern "C" {
  */
 void __NVIC_TFMSystemReset(void);
 
+#endif // MBED_CONF_PSA_PRESENT
+
 #ifdef __cplusplus
 }
 #endif