diff --git a/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp b/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp
index a99cb7c164..b822776b37 100644
--- a/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp
+++ b/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp
@@ -48,3 +48,28 @@ bool detail::WriteFromStdVector(pb_ostream_t* stream, const pb_byte_t* buf,
   vec->insert(vec->end(), buf, buf + count);
   return true;
 }
+
+bool detail::WriteSubmessage(pb_ostream_t* stream, const pb_msgdesc_t* desc,
+                             const void* msg) {
+  // Write the submessage to a separate buffer
+  wpi::SmallVector<uint8_t, 64> buf;
+  pb_ostream_t subStream{
+      .callback = WriteFromSmallVector,
+      .state = &buf,
+      .max_size = SIZE_MAX,
+      .bytes_written = 0,
+      .errmsg = nullptr,
+  };
+  if (!pb_encode(&subStream, desc, msg)) {
+    return false;
+  }
+
+  uint64_t size = static_cast<uint64_t>(buf.size());
+
+  // Write the size to the original stream.
+  if (!pb_encode_varint(stream, size)) {
+    return false;
+  }
+
+  return pb_write(stream, reinterpret_cast<const pb_byte_t*>(buf.data()), size);
+}
diff --git a/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h b/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h
index 34ad3b3aca..381ae698a2 100644
--- a/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h
+++ b/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h
@@ -43,6 +43,9 @@ bool WriteFromSmallVector(pb_ostream_t* stream, const pb_byte_t* buf,
 
 bool WriteFromStdVector(pb_ostream_t* stream, const pb_byte_t* buf,
                         size_t count);
+
+bool WriteSubmessage(pb_ostream_t* stream, const pb_msgdesc_t* desc,
+                     const void* msg);
 }  // namespace detail
 
 /**
@@ -208,7 +211,8 @@ class ProtoOutputStream {
   bool Encode(
       const typename Protobuf<std::remove_cvref_t<T>>::MessageStruct& msg) {
     if (m_streamMsg) {
-      return pb_encode_submessage(m_streamMsg, m_msgDesc, &msg);
+      return detail::WriteSubmessage(m_streamMsg, m_msgDesc, &msg);
+      // return pb_encode_submessage(m_streamMsg, m_msgDesc, &msg);
     }
     return pb_encode(&m_streamLocal, m_msgDesc, &msg);
   }