diff --git a/common/src/states/basic_aura.rs b/common/src/states/basic_aura.rs
index feb0c5ba47..0a4fef7661 100644
--- a/common/src/states/basic_aura.rs
+++ b/common/src/states/basic_aura.rs
@@ -49,6 +49,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 0.8);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs
index ca700bf91b..e69dad4f79 100644
--- a/common/src/states/basic_beam.rs
+++ b/common/src/states/basic_beam.rs
@@ -68,6 +68,7 @@ impl CharacterBehavior for Data {
             },
         }
 
+        handle_orientation(data, &mut update, 0.3);
         handle_move(data, &mut update, 0.4);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/basic_ranged.rs b/common/src/states/basic_ranged.rs
index 2c3b59883f..fa07e96fa0 100644
--- a/common/src/states/basic_ranged.rs
+++ b/common/src/states/basic_ranged.rs
@@ -42,6 +42,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 0.3);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs
index 16c55e5629..30285b964d 100644
--- a/common/src/states/charged_melee.rs
+++ b/common/src/states/charged_melee.rs
@@ -66,6 +66,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 0.7);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/charged_ranged.rs b/common/src/states/charged_ranged.rs
index 9f7434ae03..7d06447438 100644
--- a/common/src/states/charged_ranged.rs
+++ b/common/src/states/charged_ranged.rs
@@ -65,6 +65,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, self.static_data.move_speed);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs
index d72b6f1b8f..5045ffbbf7 100644
--- a/common/src/states/combo_melee.rs
+++ b/common/src/states/combo_melee.rs
@@ -119,8 +119,8 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
-        handle_orientation(data, &mut update, 0.65);
         handle_move(data, &mut update, 0.6);
+        handle_orientation(data, &mut update, 0.2);
 
         let stage_index = (self.stage - 1) as usize;
 
diff --git a/common/src/states/equipping.rs b/common/src/states/equipping.rs
index 9d4d007f25..b27da6e16e 100644
--- a/common/src/states/equipping.rs
+++ b/common/src/states/equipping.rs
@@ -26,6 +26,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 1.0);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/idle.rs b/common/src/states/idle.rs
index 00f683f809..cb24b725ec 100644
--- a/common/src/states/idle.rs
+++ b/common/src/states/idle.rs
@@ -10,6 +10,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 1.0);
         handle_jump(data, &mut update, 1.0);
         handle_wield(data, &mut update);
diff --git a/common/src/states/shockwave.rs b/common/src/states/shockwave.rs
index aeae37c351..640129480a 100644
--- a/common/src/states/shockwave.rs
+++ b/common/src/states/shockwave.rs
@@ -59,6 +59,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, self.static_data.move_efficiency);
 
         match self.stage_section {
diff --git a/common/src/states/sneak.rs b/common/src/states/sneak.rs
index 4016cef6cf..768dce701c 100644
--- a/common/src/states/sneak.rs
+++ b/common/src/states/sneak.rs
@@ -10,6 +10,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 0.4);
         handle_jump(data, &mut update, 1.0);
         handle_wield(data, &mut update);
diff --git a/common/src/states/stunned.rs b/common/src/states/stunned.rs
index 64bd813515..748760d54d 100644
--- a/common/src/states/stunned.rs
+++ b/common/src/states/stunned.rs
@@ -36,6 +36,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, self.static_data.movement_speed);
 
         match self.stage_section {
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 8cfd9e47db..0cd7be46f6 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -245,7 +245,6 @@ pub fn handle_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
 /// Updates components to move player as if theyre on ground or in air
 #[allow(clippy::assign_op_pattern)] // TODO: Pending review in #587
 fn basic_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
-    handle_orientation(data, update, 1.0);
 
     let accel = if data.physics.on_ground {
         data.body.base_accel()
diff --git a/common/src/states/wielding.rs b/common/src/states/wielding.rs
index d0457f7a27..4798b44834 100644
--- a/common/src/states/wielding.rs
+++ b/common/src/states/wielding.rs
@@ -13,6 +13,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
         handle_move(&data, &mut update, 1.0);
         handle_climb(&data, &mut update);
         attempt_input(&data, &mut update);