diff --git a/FirebaseCoreExtension.podspec b/FirebaseCoreExtension.podspec
index df78305e83..c8226dc0cc 100644
--- a/FirebaseCoreExtension.podspec
+++ b/FirebaseCoreExtension.podspec
@@ -6,6 +6,8 @@ Pod::Spec.new do |s|
     s.description      = <<-DESC
     Not for public use.
     Common FirebaseCore APIs for use in Firebase product SDKs.
+    When depending on `FirebaseCoreExtension`, also depend on `FirebaseCore` to
+    avoid potential linker issues.
                          DESC
 
     s.homepage         = 'https://firebase.google.com'
diff --git a/FirebaseFirestoreSwift.podspec b/FirebaseFirestoreSwift.podspec
index b405a712e0..5bdbc3b8a9 100644
--- a/FirebaseFirestoreSwift.podspec
+++ b/FirebaseFirestoreSwift.podspec
@@ -34,6 +34,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
     'Firestore/Swift/Source/**/*.swift',
   ]
 
+  s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'FirebaseCoreExtension', '~> 10.0'
   s.dependency 'FirebaseFirestore', '~> 10.0'
   s.dependency 'FirebaseSharedSwift', '~> 10.0'
diff --git a/Package.swift b/Package.swift
index 7d40cc2d6e..26b519f5b0 100644
--- a/Package.swift
+++ b/Package.swift
@@ -242,6 +242,8 @@ let package = Package(
     // MARK: - Firebase Core Extension
 
     // Extension of FirebaseCore for consuming by Swift product SDKs.
+    // When depending on `FirebaseCoreExtension`, also depend on `FirebaseCore`
+    // to avoid potential linker issues.
     .target(
       name: "FirebaseCoreExtension",
       path: "FirebaseCore/Extension",
@@ -702,6 +704,7 @@ let package = Package(
     .target(
       name: "FirebaseFirestoreSwift",
       dependencies: [
+        "FirebaseCore",
         "FirebaseCoreExtension",
         "FirebaseFirestore",
         "FirebaseSharedSwift",