diff --git a/bazel/workspace_deps.bzl b/bazel/workspace_deps.bzl
index 370616b56f..d0e35fd7c0 100644
--- a/bazel/workspace_deps.bzl
+++ b/bazel/workspace_deps.bzl
@@ -23,8 +23,8 @@ def upb_deps():
         _github_archive,
         name = "com_google_protobuf",
         repo = "https://github.com/protocolbuffers/protobuf",
-        commit = "af34fc6a761e3733ade14d57a05638b468af44af",
-        sha256 = "ebdace4f5911d35f48b3a5ae74ea0c548ec21943c37d436abb75298755102485",
+        commit = "6ae84761bf09db1b9da6c7fed4d708468017b79f",
+        sha256 = "1213f82d140326d2d0c570f7114df0478ac61918f25e780ccf99040dff2bec79",
         patches = ["@upb//bazel:protobuf.patch"],
     )
 
diff --git a/upb/util/def_to_proto_test.proto b/upb/util/def_to_proto_test.proto
index a28c1c55d7..862c608314 100644
--- a/upb/util/def_to_proto_test.proto
+++ b/upb/util/def_to_proto_test.proto
@@ -108,7 +108,13 @@ message PretendMessageSet {
 
   // Since this is message_set_wire_format, "max" here means INT32_MAX.
   // (For normal messages "max" would mean 2**29 - 1).
-  extensions 4 to max;
+  extensions 4 to 529999999;
+  extensions 530000000 to max
+  [declaration = {
+    number: 2147483646
+    full_name: ".pkg.MessageSetItem.message_set_extension"
+    type: ".pkg.MessageSetItem"
+  }];
 }
 
 message MessageSetItem {