diff --git a/core/proto/build.gradle.kts b/core/proto/build.gradle.kts
index 412e12e90b..29a67f87d3 100644
--- a/core/proto/build.gradle.kts
+++ b/core/proto/build.gradle.kts
@@ -58,6 +58,11 @@ wire {
     sourcePath {
         srcDir("src/main/proto")
         srcDir("src/main/wire-includes")
+        // Upstream added packages/kmp/ with symlinks back to root protos.
+        // Without filtering, Wire follows the symlinks and loads duplicates.
+        include("meshtastic/**/*.proto")
+        include("nanopb.proto")
+        include("google/**/*.proto")
     }
     kotlin {
         // Wire 6 optimization: Avoid unnecessary immutable copies of repeated/map fields.
diff --git a/core/proto/src/main/proto b/core/proto/src/main/proto
index dd6c3f850a..a0a2239c6f 160000
--- a/core/proto/src/main/proto
+++ b/core/proto/src/main/proto
@@ -1 +1 @@
-Subproject commit dd6c3f850a56a00cbc2cc5b93db2fd43b1a2f46a
+Subproject commit a0a2239c6fc08bc70499dd04a5c72b78d6e9b265