diff --git a/common/src/states/roll.rs b/common/src/states/roll.rs
index 547a703499..d75763eca8 100644
--- a/common/src/states/roll.rs
+++ b/common/src/states/roll.rs
@@ -1,5 +1,9 @@
 use crate::{
-    comp::{CharacterState, InputKind, StateUpdate},
+    comp::{
+        buff::{BuffChange, BuffKind},
+        CharacterState, InputKind, StateUpdate,
+    },
+    event::ServerEvent,
     states::{
         behavior::{CharacterBehavior, JoinData},
         utils::*,
@@ -52,6 +56,11 @@ impl CharacterBehavior for Data {
         match self.stage_section {
             StageSection::Buildup => {
                 handle_move(data, &mut update, 1.0);
+                // Remove burning effect if active
+                update.server_events.push_front(ServerEvent::Buff {
+                    entity: data.entity,
+                    buff_change: BuffChange::RemoveByKind(BuffKind::Burning),
+                });
                 if self.timer < self.static_data.buildup_duration {
                     // Build up
                     update.character = CharacterState::Roll(Data {