diff --git a/base/comps/components.toml b/base/comps/components.toml
index 2e245f3d28c..cde59d69edd 100644
--- a/base/comps/components.toml
+++ b/base/comps/components.toml
@@ -1155,7 +1155,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml"]
 [components.golang-modernc-mathutil]
 [components.golang-modernc-memory]
 [components.golang-modernc-sqlite]
-[components.golang-mongodb-mongo-driver]
 [components.golang-opencensus]
 [components.golang-opentelemetry-contrib]
 [components.golang-opentelemetry-otel]
diff --git a/base/comps/golang-mongodb-mongo-driver/golang-mongodb-mongo-driver.comp.toml b/base/comps/golang-mongodb-mongo-driver/golang-mongodb-mongo-driver.comp.toml
new file mode 100644
index 00000000000..257d1df0fde
--- /dev/null
+++ b/base/comps/golang-mongodb-mongo-driver/golang-mongodb-mongo-driver.comp.toml
@@ -0,0 +1,10 @@
+[components.golang-mongodb-mongo-driver]
+
+# The aws-sdk-go-devel bootstrap build has auto-generated Requires stripped,
+# so it doesn't transitively pull in golang-github-jmespath-devel. Add the
+# missing build dependency explicitly until a non-bootstrap aws-sdk-go is available.
+[[components.golang-mongodb-mongo-driver.overlays]]
+description = "Add missing transitive BuildRequires on go-jmespath (needed by aws-sdk-go, missing in bootstrap builds)"
+type = "spec-add-tag"
+tag = "BuildRequires"
+value = "golang(github.com/jmespath/go-jmespath)"