diff --git a/client/src/events.jsx b/client/src/events.jsx
index 44b437b0..f1b7e158 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -93,10 +93,12 @@ function registerEvents(store) {
 
                     if (r.stages.includes('START_SKILL') && anims.animSource) {
                         store.dispatch(actions.setAnimSource(anims.animSource));
+                        store.dispatch(actions.setAnimText(null));
                     }
 
                     if (r.stages.includes('END_SKILL') && anims.animTarget) {
                         store.dispatch(actions.setAnimTarget(anims.animTarget));
+                        store.dispatch(actions.setAnimText(null));
                         if (animations.isCbAnim(anims.animSkill)) store.dispatch(actions.setAnimCb(cb));
                     }
 
@@ -107,9 +109,9 @@ function registerEvents(store) {
                         } else {
                             setTimeout(
                                 () => store.dispatch(actions.setAnimText(text)),
-                                timeout - TIMES.POST_SKILL_DURATION_MS - 500
+                                timeout - TIMES.POST_SKILL_DURATION_MS - 700
                             );
-                            timeout -= 500;
+                            timeout -= 700;
                         }
                     }
 
@@ -117,7 +119,7 @@ function registerEvents(store) {
                         store.dispatch(actions.setAnimSkill(null));
                         store.dispatch(actions.setAnimSource(null));
                         store.dispatch(actions.setAnimTarget(null));
-                        store.dispatch(actions.setAnimText(null));
+                        // store.dispatch(actions.setAnimText(null));
                         store.dispatch(actions.setAnimFocus([]));
                         if (r.stages.includes('END_SKILL') && animations.isCbAnim(anims.animSkill)) return true;
                         return cb();