diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp
index a7f1356d..7764067e 100644
--- a/Minecraft.Client/LocalPlayer.cpp
+++ b/Minecraft.Client/LocalPlayer.cpp
@@ -313,7 +313,8 @@ void LocalPlayer::aiStep()
 	}	
 
 	// 4J Stu - Fix for #52705 - Customer Encountered: Player can fly in bed while being in Creative mode.
-	if (!isSleeping() && (abilities.mayfly || isAllowedToFly() ))
+	//str1k3r - Add !isRiding() to fix being able to fly while riding Entity
+	if ((!isSleeping() && !isRiding()) && (abilities.mayfly || isAllowedToFly()))
 	{
 		// 4J altered to require jump button to released after being tapped twice to trigger move between flying / not flying
 		if (!wasJumping && input->jumping)