diff --git a/common/systems/src/character_behavior.rs b/common/systems/src/character_behavior.rs
index 26838fe3e5..f0712c5531 100644
--- a/common/systems/src/character_behavior.rs
+++ b/common/systems/src/character_behavior.rs
@@ -212,10 +212,11 @@ impl<'a> System<'a> for Sys {
             // If mounted, character state is controlled by mount
             if is_rider.is_some() {
                 let idle_state = CharacterState::Idle(idle::Data { is_sneaking: false });
-                if *join_struct.char_state != idle_state {
-                    *join_struct.char_state = idle_state;
-                }
-                continue;
+                // TODO: A better way to swap between mount inputs and rider
+                // inputs if *join_struct.char_state !=
+                // idle_state {     *join_struct.char_state =
+                // idle_state; }
+                // continue;
             }
 
             let j = JoinData::new(