diff --git a/targets/TARGET_STM/TARGET_STM32F4/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32F4/PeripheralNames.h
index a7786020d8..50e86a20e5 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/PeripheralNames.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/PeripheralNames.h
@@ -139,7 +139,7 @@ typedef enum {
 #endif
 } PWMName;
 
-#if DEVICE_CAN
+#if CAN1_BASE
 typedef enum {
     CAN_1 = (int)CAN1_BASE,
 #if defined CAN2_BASE
diff --git a/targets/targets.json b/targets/targets.json
index 382801f9c1..15bce67095 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1798,6 +1798,7 @@
         ],
         "device_has_add": [
             "ANALOGOUT",
+            "CAN",
             "TRNG"
         ]
     },
@@ -1816,6 +1817,7 @@
             "EMAC"
         ],
         "device_has_remove": [
+            "CAN",
             "LPTICKER",
             "SERIAL_FC"
         ],