diff --git a/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/gpio_api.c b/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/gpio_api.c
index 2706e3cfb3..66bf6ca4cc 100644
--- a/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/gpio_api.c
+++ b/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/gpio_api.c
@@ -28,7 +28,6 @@ uint32_t gpio_set(PinName pin)
 
 void gpio_init(gpio_t *obj, PinName pin)
 {
-    MBED_ASSERT(pin != (PinName)NC);
     struct port_config pin_conf;
     PortGroup *const port_base = (PortGroup*)port_get_group_from_gpio_pin(pin);
 
diff --git a/targets/TARGET_Atmel/TARGET_SAM_CortexM4/gpio_api.c b/targets/TARGET_Atmel/TARGET_SAM_CortexM4/gpio_api.c
index bb1af21258..b6613e4d1c 100644
--- a/targets/TARGET_Atmel/TARGET_SAM_CortexM4/gpio_api.c
+++ b/targets/TARGET_Atmel/TARGET_SAM_CortexM4/gpio_api.c
@@ -30,13 +30,15 @@ uint32_t gpio_set(PinName pin)
 
 void gpio_init(gpio_t *obj, PinName pin)
 {
-    MBED_ASSERT(pin != (PinName)NC);
     if (g_sys_init == 0) {
         sysclk_init();
         system_board_init();
         g_sys_init = 1;
     }
     obj->pin = pin;
+    if (pin == NC) {
+        return;
+    }
 
     ioport_set_pin_dir(pin, IOPORT_DIR_INPUT);
     ioport_set_pin_mode(pin, IOPORT_MODE_PULLUP);