diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 1ff4c05f..72e6fd85 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-    ".": "2.21.0"
+    ".": "2.21.1"
 }
   
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b648e4e..0854b871 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@
 [1]: https://pypi.org/project/google-cloud-pubsub/#history
 
 
+## [2.21.1](https://github.com/googleapis/python-pubsub/compare/v2.21.0...v2.21.1) (2024-04-04)
+
+
+### Bug Fixes
+
+* Set timeout to infinite for publishing with ordering keys enabled ([#1134](https://github.com/googleapis/python-pubsub/issues/1134)) ([67daf3c](https://github.com/googleapis/python-pubsub/commit/67daf3c64239d22eabe59c3df214057a4e59a39e))
+
 ## [2.21.0](https://github.com/googleapis/python-pubsub/compare/v2.20.3...v2.21.0) (2024-03-26)
 
 
diff --git a/google/cloud/pubsub_v1/publisher/client.py b/google/cloud/pubsub_v1/publisher/client.py
index caf9fa18..54b35327 100644
--- a/google/cloud/pubsub_v1/publisher/client.py
+++ b/google/cloud/pubsub_v1/publisher/client.py
@@ -399,8 +399,13 @@ def on_publish_done(future):
                     transport = self._transport
                     base_retry = transport._wrapped_methods[transport.publish]._retry
                     retry = base_retry.with_deadline(2.0**32)
+                    # timeout needs to be overridden and set to infinite in
+                    # addition to the retry deadline since both determine
+                    # the duration for which retries are attempted.
+                    timeout = 2.0**32
                 elif retry is not None:
                     retry = retry.with_deadline(2.0**32)
+                    timeout = 2.0**32
 
             # Delegate the publishing to the sequencer.
             sequencer = self._get_or_create_sequencer(topic, ordering_key)
diff --git a/google/pubsub/gapic_version.py b/google/pubsub/gapic_version.py
index e546bae0..e71611fa 100644
--- a/google/pubsub/gapic_version.py
+++ b/google/pubsub/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.21.0"  # {x-release-please-version}
+__version__ = "2.21.1"  # {x-release-please-version}
diff --git a/google/pubsub_v1/gapic_version.py b/google/pubsub_v1/gapic_version.py
index e546bae0..e71611fa 100644
--- a/google/pubsub_v1/gapic_version.py
+++ b/google/pubsub_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.21.0"  # {x-release-please-version}
+__version__ = "2.21.1"  # {x-release-please-version}
diff --git a/samples/generated_samples/snippet_metadata_google.pubsub.v1.json b/samples/generated_samples/snippet_metadata_google.pubsub.v1.json
index b053d68d..619f0eac 100644
--- a/samples/generated_samples/snippet_metadata_google.pubsub.v1.json
+++ b/samples/generated_samples/snippet_metadata_google.pubsub.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-pubsub",
-    "version": "2.21.0"
+    "version": "2.21.1"
   },
   "snippets": [
     {
diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
index cc8eda56..46024673 100644
--- a/tests/unit/pubsub_v1/publisher/test_publisher_client.py
+++ b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -316,6 +316,10 @@ def test_publish_with_ordering_key_uses_extended_retry_deadline(creds):
     expected_retry = custom_retry.with_deadline(2.0**32)
     _assert_retries_equal(batch_commit_retry, expected_retry)
 
+    batch_commit_timeout = kwargs["commit_timeout"]
+    expected_timeout = 2.0**32
+    assert batch_commit_timeout == pytest.approx(expected_timeout)
+
 
 def test_publish_with_ordering_key_with_no_retry(creds):
     client = publisher.Client(