diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
index 17702a1a..65a7fc31 100644
--- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
@@ -247,7 +247,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                 TrackTime = @event.NewTrackTime ?? @event.TrackTime,
                 TrackTimeZone = @event.TrackTimeZone,
                 CompareFields = @event.CompareFields,
-                Extra = @event.Extra
+                Extra = @event.NewExtra ?? @event.Extra
             },
             ForcedPush = @event.ForcedPush,
             IsToMq = (trackContent.IsToMq || @event.IsToMq)
diff --git a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
index 9b790e89..0b772567 100644
--- a/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
+++ b/src/SJZY.Track.Application/Services/Broadcasting/BroadcastingService.cs
@@ -56,7 +56,7 @@ public class BroadcastingService : IBroadcastingService
             OrderIdentifiers = eto.OrderIdentifiers,
             CustomId = eto.CustomId,
             SubSystemId = eto.SubSystemId,
-            Extra = eto.Extra
+            Extra = eto.NewExtra ?? eto.Extra
         };
 
         if (eto.IsAdd)