diff --git a/targets/TARGET_STM/watchdog_api.c b/targets/TARGET_STM/watchdog_api.c
index ca62c7ae6c..f1d6ebe964 100644
--- a/targets/TARGET_STM/watchdog_api.c
+++ b/targets/TARGET_STM/watchdog_api.c
@@ -138,7 +138,7 @@ watchdog_features_t hal_watchdog_get_platform_features(void)
     features.clock_max_frequency = 50000;
 #elif defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     features.clock_max_frequency = 33600;
-#elif defined(STM32G0) || defined(STM32L5)
+#elif defined(STM32G0) || defined(STM32L5) || defined(STM32G4)
     features.clock_max_frequency = 34000;
 #else
 #error "unsupported target"
diff --git a/targets/targets.json b/targets/targets.json
index a45042f562..ac7fc191f5 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -7576,7 +7576,6 @@
             "SPI",
             "SPISLAVE",
             "SPI_ASYNCH",
-            "WATCHDOG",
             "RESET_REASON"
         ],
         "detect_code": [