diff --git a/rtos/source/TARGET_CORTEX/mbed_lib.json b/rtos/source/TARGET_CORTEX/mbed_lib.json
index 8fe9e42620..6ef6c49d6f 100644
--- a/rtos/source/TARGET_CORTEX/mbed_lib.json
+++ b/rtos/source/TARGET_CORTEX/mbed_lib.json
@@ -81,6 +81,9 @@
         },
         "NUVOTON": {
             "idle-thread-stack-size-debug-extra": 512
+        },
+        "MCU_PSOC6_M4": {
+            "target.macros_add": ["CY_RTOS_AWARE"]
         }
     }
 }
diff --git a/targets/targets.json b/targets/targets.json
index c97cb630a1..0070733152 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -5893,7 +5893,6 @@
         ],
         "macros_add": [
             "MCU_PSOC6_M4",
-            "CY_RTOS_AWARE",
             "CY_USING_HAL",
             "MBED_TICKLESS"
         ],