diff --git a/interface/src/tfm_crypto_api.c b/interface/src/tfm_crypto_api.c
index 554cdb5..e18d611 100644
--- a/interface/src/tfm_crypto_api.c
+++ b/interface/src/tfm_crypto_api.c
@@ -18,14 +18,10 @@
 #ifdef TFM_PSA_API
 #include "psa/client.h"
 
-/* Macro to check for a valid PSA handle */
-/* FixMe: Here temporarily until it's added to the framework headers */
-#define PSA_IS_HANDLE_VALID(handle) ((handle) > (psa_handle_t)0)
-
 #define PSA_CONNECT(service)                                    \
     psa_handle_t ipc_handle;                                    \
     ipc_handle = psa_connect(service##_SID, service##_VERSION); \
-    if (!PSA_IS_HANDLE_VALID(ipc_handle)) {                     \
+    if (!PSA_HANDLE_IS_VALID(ipc_handle)) {                     \
         return PSA_ERROR_GENERIC_ERROR;                         \
     }                                                           \