diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 177dde95d63b..328cef5a0c97 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -27,7 +27,7 @@
   "handwritten/cloud-profiler": "7.0.1",
   "handwritten/datastore": "10.1.1",
   "handwritten/error-reporting": "3.0.6",
-  "handwritten/firestore": "8.7.0",
+  "handwritten/firestore": "8.7.1",
   "handwritten/google-cloud-dns": "5.3.2",
   "handwritten/logging": "11.4.0",
   "handwritten/logging-bunyan": "5.1.2",
diff --git a/changelog.json b/changelog.json
index e4e97c6915a4..2cb451a85eb4 100644
--- a/changelog.json
+++ b/changelog.json
@@ -19,6 +19,24 @@
       "id": "3d414cc1-2f0c-4d66-aaf9-d0224a334b8c",
       "createTime": "2026-08-04T02:57:11.657Z"
     },
+    {
+      "changes": [
+        {
+          "type": "fix",
+          "sha": "1d3c655992216e4e79a86480f84ff7eae9a5e6c5",
+          "message": "Prevent adding telemetry events to ended spans (#8847)",
+          "issues": [
+            "8939"
+          ],
+          "scope": "firestore"
+        }
+      ],
+      "version": "8.7.1",
+      "language": "JAVASCRIPT",
+      "artifactName": "@google-cloud/firestore",
+      "id": "df4dea8f-90fd-4d79-b41e-75745b5bda94",
+      "createTime": "2026-08-04T02:57:11.545Z"
+    },
     {
       "changes": [
         {
@@ -83927,4 +83945,4 @@
     }
   ],
   "updateTime": "2026-08-04T02:57:11.657Z"
-}
\ No newline at end of file
+}
diff --git a/handwritten/firestore/CHANGELOG.md b/handwritten/firestore/CHANGELOG.md
index 07a3bdd828b6..74949e035429 100644
--- a/handwritten/firestore/CHANGELOG.md
+++ b/handwritten/firestore/CHANGELOG.md
@@ -5,6 +5,13 @@
 
 [1]: https://www.npmjs.com/package/@google-cloud/firestore?activeTab=versions
 
+## [8.7.1](https://github.com/googleapis/google-cloud-node/compare/firestore-v8.7.0...firestore-v8.7.1) (2026-08-04)
+
+
+### Bug Fixes
+
+* **firestore:** Prevent adding telemetry events to ended spans ([#8847](https://github.com/googleapis/google-cloud-node/issues/8847)) ([#8939](https://github.com/googleapis/google-cloud-node/issues/8939)) ([1d3c655](https://github.com/googleapis/google-cloud-node/commit/1d3c655992216e4e79a86480f84ff7eae9a5e6c5))
+
 ## [8.7.0](https://github.com/googleapis/google-cloud-node/compare/firestore-v8.6.0...firestore-v8.7.0) (2026-07-21)
 
 
diff --git a/handwritten/firestore/package.json b/handwritten/firestore/package.json
index 0dee01e6dcfc..2ec15efc7a01 100644
--- a/handwritten/firestore/package.json
+++ b/handwritten/firestore/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@google-cloud/firestore",
   "description": "Firestore Client Library for Node.js",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "license": "Apache-2.0",
   "author": "Google Inc.",
   "engines": {