diff --git a/esp-metadata/Cargo.toml b/esp-metadata/Cargo.toml
index 754cf512711..9cdf9a4e983 100644
--- a/esp-metadata/Cargo.toml
+++ b/esp-metadata/Cargo.toml
@@ -9,7 +9,7 @@ license      = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow     = "1.0.86"
-clap       = { version = "4.5.16", features = ["derive"] }
+clap       = { version = "4.5.16", features = ["derive"], optional = true }
 basic-toml  = "0.1.9"
 lazy_static = "1.5.0"
 serde       = { version = "1.0.209", features = ["derive"] }
diff --git a/esp-metadata/src/lib.rs b/esp-metadata/src/lib.rs
index 785ee502ce6..3812ec15ab3 100644
--- a/esp-metadata/src/lib.rs
+++ b/esp-metadata/src/lib.rs
@@ -88,8 +88,8 @@ pub enum Cores {
     strum::EnumIter,
     strum::EnumString,
     strum::AsRefStr,
-    clap::ValueEnum,
 )]
+#[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
 #[serde(rename_all = "kebab-case")]
 #[strum(serialize_all = "kebab-case")]
 pub enum Chip {
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 06b9ce793c0..f667a1c124f 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -17,4 +17,4 @@ semver     = { version = "1.0.23",  features = ["serde"] }
 serde      = { version = "1.0.203", features = ["derive"] }
 strum      = { version = "0.26.2",  features = ["derive"] }
 toml_edit  = "0.22.13"
-esp-metadata = { path = "../esp-metadata" }
+esp-metadata = { path = "../esp-metadata", features = ["clap"] }