diff --git a/Firestore/CHANGELOG.md b/Firestore/CHANGELOG.md
index 5781296165b..61c08250d85 100644
--- a/Firestore/CHANGELOG.md
+++ b/Firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Unreleased
+- [fixed] Add conditional `Sendable` conformance so `ServerTimestamp<T>` is
+  `Sendable` if `T` is `Sendable`. (#14042)
+
 # 11.4.0
 - [changed] Prepare Firestore cache to support session token.
 
diff --git a/Firestore/Swift/Source/Codable/ServerTimestamp.swift b/Firestore/Swift/Source/Codable/ServerTimestamp.swift
index fe6bbd696db..753878c16d5 100644
--- a/Firestore/Swift/Source/Codable/ServerTimestamp.swift
+++ b/Firestore/Swift/Source/Codable/ServerTimestamp.swift
@@ -105,3 +105,5 @@ public struct ServerTimestamp<Value>: Codable
 extension ServerTimestamp: Equatable where Value: Equatable {}
 
 extension ServerTimestamp: Hashable where Value: Hashable {}
+
+extension ServerTimestamp: Sendable where Value: Sendable {}