diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/gpio_api_ns.c b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/gpio_api_ns.c
index 42faf1bff0..776fbd8910 100644
--- a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/gpio_api_ns.c
+++ b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/gpio_api_ns.c
@@ -37,7 +37,7 @@
 
 #define IRQ_MODE_CHECK(is_func_void) \
     /* Secure service can't be called in interrupt context. */ \
-    if (IsIrqMode()) { \
+    if (IsException()) { \
         MBED_WARNING(MBED_MAKE_ERROR(MBED_MODULE_HAL, \
                 MBED_ERROR_INVALID_OPERATION), \
                 "GPIO secure service can't be called in interrupt context\n"); \
diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/pinmap_ns.c b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/pinmap_ns.c
index 77b396c833..c77b3712ee 100644
--- a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/pinmap_ns.c
+++ b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/pinmap_ns.c
@@ -81,7 +81,7 @@ void pin_function(PinName pin, int function)
     MBED_ASSERT(pin != NC);
 
     /* Secure service can't be called in interrupt context. */
-    if (IsIrqMode()) {
+    if (IsException()) {
         MBED_WARNING(MBED_MAKE_ERROR(MBED_MODULE_HAL,
                 MBED_ERROR_INVALID_OPERATION),
                 "Pin secure service can't be called in interrupt context\n");
@@ -127,7 +127,7 @@ void pin_mode(PinName pin, PinMode mode)
     MBED_ASSERT(pin != NC);
 
     /* Secure service can't be called in interrupt context. */
-    if (IsIrqMode()) {
+    if (IsException()) {
         MBED_WARNING(MBED_MAKE_ERROR(MBED_MODULE_HAL,
                 MBED_ERROR_INVALID_OPERATION),
                 "Pin secure service can't be called in interrupt context\n");
diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/gpio_api_ns.c b/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/gpio_api_ns.c
index aa09bc18db..c7a6044133 100644
--- a/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/gpio_api_ns.c
+++ b/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/gpio_api_ns.c
@@ -37,7 +37,7 @@
 
 #define IRQ_MODE_CHECK(is_func_void) \
     /* Secure service can't be called in interrupt context. */ \
-    if (IsIrqMode()) { \
+    if (IsException()) { \
         MBED_WARNING(MBED_MAKE_ERROR(MBED_MODULE_HAL, \
                 MBED_ERROR_INVALID_OPERATION), \
                 "GPIO secure service can't be called in interrupt context\n"); \