diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index d55c0cd04..52935fd27 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -9721,6 +9721,11 @@ void Player::ContinueTaxiFlight()
         return;
     }
 
+    if (IsInDisallowedMountForm())
+    {
+        RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
+    }
+
     GetSession()->SendDoFlight(mountDisplayId, path, startNode);
 }