diff --git a/client/src/api/eventstream.tsx b/client/src/api/eventstream.tsx
index e8f0d9ca..70cbbc3f 100644
--- a/client/src/api/eventstream.tsx
+++ b/client/src/api/eventstream.tsx
@@ -3,7 +3,13 @@ import backend from "./backend";
 import { updateControlPoint } from "./controlPointsSlice";
 import { ControlPoint } from "./controlpoint";
 import { Flight } from "./flight";
-import { deselectFlight, selectFlight } from "./flightsSlice";
+import {
+  deselectFlight,
+  registerFlight,
+  selectFlight,
+  unregisterFlight,
+  updateFlight,
+} from "./flightsSlice";
 import {
   addFrontLine,
   deleteFrontLine,
@@ -42,6 +48,21 @@ export const handleStreamedEvents = (
   dispatch: AppDispatch,
   events: GameUpdateEvents
 ) => {
+  for (const flight of events.new_flights) {
+    dispatch(registerFlight(flight));
+  }
+
+  for (const id of events.updated_flights) {
+    backend.get(`/flights/${id}?with_waypoints=true`).then((response) => {
+      const flight = response.data as Flight;
+      dispatch(updateFlight(flight));
+    });
+  }
+
+  for (const id of events.deleted_flights) {
+    dispatch(unregisterFlight(id));
+  }
+
   if (events.deselected_flight) {
     dispatch(deselectFlight());
   }
diff --git a/client/src/api/flightsSlice.ts b/client/src/api/flightsSlice.ts
index c8c3c796..d582aeca 100644
--- a/client/src/api/flightsSlice.ts
+++ b/client/src/api/flightsSlice.ts
@@ -43,6 +43,11 @@ export const flightsSlice = createSlice({
         );
       }
     },
+    updateFlight: (state, action: PayloadAction<Flight>) => {
+      const flight = action.payload;
+      const ato = flight.blue ? state.blue : state.red;
+      ato[flight.id] = flight;
+    },
     deselectFlight: (state) => {
       state.selected = null;
     },
@@ -57,6 +62,7 @@ export const {
   clearFlights,
   registerFlight,
   unregisterFlight,
+  updateFlight,
   deselectFlight,
   selectFlight,
 } = flightsSlice.actions;