diff --git a/firestore/google/cloud/firestore_v1/client.py b/firestore/google/cloud/firestore_v1/client.py
index dd75b00cb76c..56356d97911b 100644
--- a/firestore/google/cloud/firestore_v1/client.py
+++ b/firestore/google/cloud/firestore_v1/client.py
@@ -36,6 +36,7 @@
 from google.cloud.firestore_v1.document import DocumentSnapshot
 from google.cloud.firestore_v1.field_path import render_field_path
 from google.cloud.firestore_v1.gapic import firestore_client
+from google.cloud.firestore_v1.gapic.transports import firestore_grpc_transport
 from google.cloud.firestore_v1.transaction import Transaction
 
 
@@ -112,12 +113,33 @@ def _firestore_api(self):
             <The GAPIC client with the credentials of the current client.
         """
         if self._firestore_api_internal is None:
+            # Use a custom channel.
+            # We need this in order to set appropriate keepalive options.
+            channel = firestore_grpc_transport.FirestoreGrpcTransport.create_channel(
+                self._target,
+                credentials=self._credentials,
+                options={"grpc.keepalive_time_ms": 30000}.items(),
+            )
+
+            self._transport = firestore_grpc_transport.FirestoreGrpcTransport(
+                address=self._target, channel=channel
+            )
+
             self._firestore_api_internal = firestore_client.FirestoreClient(
-                credentials=self._credentials, client_info=self._client_info
+                transport=self._transport, client_info=self._client_info
             )
 
         return self._firestore_api_internal
 
+    @property
+    def _target(self):
+        """Return the target (where the API is).
+
+        Returns:
+            str: The location of the API.
+        """
+        return firestore_client.FirestoreClient.SERVICE_ADDRESS
+
     @property
     def _database_string(self):
         """The database string corresponding to this client's project.
diff --git a/firestore/google/cloud/firestore_v1beta1/client.py b/firestore/google/cloud/firestore_v1beta1/client.py
index a289a505df04..26f061c7419c 100644
--- a/firestore/google/cloud/firestore_v1beta1/client.py
+++ b/firestore/google/cloud/firestore_v1beta1/client.py
@@ -33,6 +33,7 @@
 from google.cloud.firestore_v1beta1.document import DocumentSnapshot
 from google.cloud.firestore_v1beta1.field_path import render_field_path
 from google.cloud.firestore_v1beta1.gapic import firestore_client
+from google.cloud.firestore_v1beta1.gapic.transports import firestore_grpc_transport
 from google.cloud.firestore_v1beta1.transaction import Transaction
 
 
@@ -96,12 +97,33 @@ def _firestore_api(self):
             GAPIC client with the credentials of the current client.
         """
         if self._firestore_api_internal is None:
+            # Use a custom channel.
+            # We need this in order to set appropriate keepalive options.
+            channel = firestore_grpc_transport.FirestoreGrpcTransport.create_channel(
+                self._target,
+                credentials=self._credentials,
+                options={"grpc.keepalive_time_ms": 30000}.items(),
+            )
+
+            self._transport = firestore_grpc_transport.FirestoreGrpcTransport(
+                address=self._target, channel=channel
+            )
+
             self._firestore_api_internal = firestore_client.FirestoreClient(
-                credentials=self._credentials
+                transport=self._transport
             )
 
         return self._firestore_api_internal
 
+    @property
+    def _target(self):
+        """Return the target (where the API is).
+
+        Returns:
+            str: The location of the API.
+        """
+        return firestore_client.FirestoreClient.SERVICE_ADDRESS
+
     @property
     def _database_string(self):
         """The database string corresponding to this client's project.
diff --git a/firestore/tests/unit/v1/test_client.py b/firestore/tests/unit/v1/test_client.py
index 5fc92479d607..737d2313656a 100644
--- a/firestore/tests/unit/v1/test_client.py
+++ b/firestore/tests/unit/v1/test_client.py
@@ -69,6 +69,7 @@ def test_constructor_explicit(self):
         return_value=mock.sentinel.firestore_api,
     )
     def test__firestore_api_property(self, mock_client):
+        mock_client.SERVICE_ADDRESS = "endpoint"
         client = self._make_default_one()
         client_info = client._client_info = mock.Mock()
         self.assertIsNone(client._firestore_api_internal)
@@ -76,7 +77,7 @@ def test__firestore_api_property(self, mock_client):
         self.assertIs(firestore_api, mock_client.return_value)
         self.assertIs(firestore_api, client._firestore_api_internal)
         mock_client.assert_called_once_with(
-            credentials=client._credentials, client_info=client_info
+            transport=client._transport, client_info=client_info
         )
 
         # Call again to show that it is cached, but call count is still 1.
diff --git a/firestore/tests/unit/v1beta1/test_client.py b/firestore/tests/unit/v1beta1/test_client.py
index 343f93fc5c16..f8f14ee1e57a 100644
--- a/firestore/tests/unit/v1beta1/test_client.py
+++ b/firestore/tests/unit/v1beta1/test_client.py
@@ -62,12 +62,13 @@ def test_constructor_explicit(self):
         return_value=mock.sentinel.firestore_api,
     )
     def test__firestore_api_property(self, mock_client):
+        mock_client.SERVICE_ADDRESS = "endpoint"
         client = self._make_default_one()
         self.assertIsNone(client._firestore_api_internal)
         firestore_api = client._firestore_api
         self.assertIs(firestore_api, mock_client.return_value)
         self.assertIs(firestore_api, client._firestore_api_internal)
-        mock_client.assert_called_once_with(credentials=client._credentials)
+        mock_client.assert_called_once_with(transport=client._transport)
 
         # Call again to show that it is cached, but call count is still 1.
         self.assertIs(client._firestore_api, mock_client.return_value)