diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoWalk.kt b/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoWalk.kt
index 1659e4e08..6f854c2b1 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoWalk.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/movement/AutoWalk.kt
@@ -11,6 +11,7 @@ import me.zeroeightsix.kami.setting.Setting
 import me.zeroeightsix.kami.setting.Settings
 import me.zeroeightsix.kami.util.MathsUtils
 import me.zeroeightsix.kami.util.MathsUtils.Cardinal
+import me.zeroeightsix.kami.util.MessageSendHelper.sendErrorMessage
 import net.minecraftforge.client.event.InputUpdateEvent
 
 /**
@@ -53,7 +54,16 @@ class AutoWalk : Module() {
     public override fun onEnable() {
         if (mode.value != AutoWalkMode.BARITONE) return
 
-        if (mc.player == null) { disable(); return }
+        if (mc.player == null) {
+            disable()
+            return
+        }
+
+        if (mc.player.isElytraFlying) {
+            sendErrorMessage(chatName + "Baritone mode isn't currently compatible with Elytra flying! Choose a different mode if you want to use AutoWalk while Elytra flying")
+            disable()
+            return
+        }
 
         when (MathsUtils.getPlayerCardinal(mc)!!) {
             Cardinal.POS_Z -> BaritoneAPI.getProvider().primaryBaritone.customGoalProcess.setGoalAndPath(GoalXZ(mc.player.posX.toInt(), mc.player.posZ.toInt() + border))
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.kt b/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.kt
index a704fc44c..3a5f1d940 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/movement/ElytraFlight.kt
@@ -3,12 +3,10 @@ package me.zeroeightsix.kami.module.modules.movement
 import me.zero.alpine.listener.EventHandler
 import me.zero.alpine.listener.EventHook
 import me.zero.alpine.listener.Listener
-import me.zero.alpine.type.EventState
 import me.zeroeightsix.kami.KamiMod
-import me.zeroeightsix.kami.event.events.MotionEvent
+import me.zeroeightsix.kami.KamiMod.MODULE_MANAGER
 import me.zeroeightsix.kami.event.events.PacketEvent
 import me.zeroeightsix.kami.event.events.PlayerTravelEvent
-import me.zeroeightsix.kami.event.events.TravelEvent
 import me.zeroeightsix.kami.module.Module
 import me.zeroeightsix.kami.setting.Setting.SettingListeners
 import me.zeroeightsix.kami.setting.Settings
@@ -153,7 +151,7 @@ class ElytraFlight : Module() {
         if (hoverTarget < 0.0) hoverTarget = mc.player.posY
 
         /* this is horrible but what other way to store these for later */
-        val moveForward = mc.gameSettings.keyBindForward.isKeyDown
+        val moveForward = mc.gameSettings.keyBindForward.isKeyDown || (MODULE_MANAGER.isModuleEnabled(AutoWalk::class.java) && MODULE_MANAGER.getModuleT(AutoWalk::class.java).mode.value == AutoWalk.AutoWalkMode.FORWARD)
         val moveBackward = mc.gameSettings.keyBindBack.isKeyDown
         val moveLeft = mc.gameSettings.keyBindLeft.isKeyDown
         val moveRight = mc.gameSettings.keyBindRight.isKeyDown