diff --git a/common/src/main/proto/TransportMessages.proto b/common/src/main/proto/TransportMessages.proto
index 103a64da72d..ec34c1d5e43 100644
--- a/common/src/main/proto/TransportMessages.proto
+++ b/common/src/main/proto/TransportMessages.proto
@@ -444,8 +444,8 @@ message PbHeartbeatFromApplication {
   repeated PbWorkerInfo needCheckedWorkerList = 5;
   bool shouldResponse = 6;
   int64 shuffleCount = 7;
-  int64 applicationCount = 8;
-  map<string, int64> shuffleFallbackCounts = 9;
+  map<string, int64> shuffleFallbackCounts = 8;
+  int64 applicationCount = 9;
   map<string, int64> applicationFallbackCounts = 10;
 }
 
@@ -682,8 +682,8 @@ message PbSnapshotMetaInfo {
   map<string, PbApplicationMeta> applicationMetas = 16;
   repeated PbWorkerInfo decommissionWorkers = 17;
   int64 shuffleTotalCount = 18;
-  int64 applicationTotalCount = 19;
-  map<string, int64> shuffleFallbackCounts = 20;
+  map<string, int64> shuffleFallbackCounts = 19;
+  int64 applicationTotalCount = 20;
   map<string, int64> applicationFallbackCounts = 21;
 }
 
diff --git a/master/src/main/proto/Resource.proto b/master/src/main/proto/Resource.proto
index 2fe82ec46e1..0c0bf036acd 100644
--- a/master/src/main/proto/Resource.proto
+++ b/master/src/main/proto/Resource.proto
@@ -121,8 +121,8 @@ message AppHeartbeatRequest {
   required int64 totalWritten = 3;
   required int64 fileCount = 4;
   optional int64 shuffleCount = 5;
-  optional int64 applicationCount = 6;
-  map<string, int64> shuffleFallbackCounts = 7;
+  map<string, int64> shuffleFallbackCounts = 6;
+  optional int64 applicationCount = 7;
   map<string, int64> applicationFallbackCounts = 8;
 }