diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
index 8db126a46375d..42251df436d82 100644
--- a/data/mods/Xedra_Evolved/effects/effects.json
+++ b/data/mods/Xedra_Evolved/effects/effects.json
@@ -3015,7 +3015,6 @@
     "id": "effect_xedra_time_loop",
     "name": [ "Time Looped" ],
     "desc": [ "Every few seconds every change to your person reverts." ],
-    "remove_message": "Your time loop ends!",
     "rating": "good",
     "flags": [ "CANNOT_CHANGE_TEMPERATURE", "FREEZE_EFFECTS", "CANNOT_GAIN_EFFECTS" ],
     "enchantments": [ { "values": [ { "value": "EQUIPMENT_DAMAGE_CHANCE", "multiply": -1 } ] } ],
diff --git a/data/mods/Xedra_Evolved/eocs/chronomancer_eocs.json b/data/mods/Xedra_Evolved/eocs/chronomancer_eocs.json
index 38e75cded8ecf..7403efcb117b6 100644
--- a/data/mods/Xedra_Evolved/eocs/chronomancer_eocs.json
+++ b/data/mods/Xedra_Evolved/eocs/chronomancer_eocs.json
@@ -491,6 +491,23 @@
       { "run_eocs": "EOC_XEDRA_TIME_LOOP_LOOP", "time_in_future": "5 seconds" }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_XEDRA_TIME_LOOP_ENDED_LOOP",
+    "eoc_type": "EVENT",
+    "required_event": "character_loses_effect",
+    "condition": { "compare_string": [ "effect_xedra_time_loop", { "context_val": "effect" } ] },
+    "effect": [
+      {
+        "u_message": "Your time loop ends!",
+        "type": "neutral",
+        "popup": true,
+        "popup_w_interrupt_query": true,
+        "interrupt_type": "eoc"
+      },
+      { "run_eocs": "EOC_XEDRA_TIME_LOAD_VARIABLES_DYNAMIC", "variables": { "xedra_chronomancer_prefix": "time_loop" } }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_XEDRA_CHRONOMANCER_OPEN_INSIGHT_MENU",