diff --git a/frontend/src/_stores/appDataStore.js b/frontend/src/_stores/appDataStore.js
index f77d32b644..85c763ccd5 100644
--- a/frontend/src/_stores/appDataStore.js
+++ b/frontend/src/_stores/appDataStore.js
@@ -60,8 +60,9 @@ export const useAppDataStore = create(
           const updatedEvents = get().events;
 
           updatedEvents.forEach((e, index) => {
-            if (e.id === response[index].id) {
-              updatedEvents[index] = response[index];
+            const toUpdate = response.find((r) => r.id === e.id);
+            if (toUpdate) {
+              updatedEvents[index] = toUpdate;
             }
           });