diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
index 706eb512..98e99aa4 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
@@ -432,9 +432,14 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
                         entity.setVelocity(entity.getVelocity().multiply(1, 0, 1));
                         entity.setSneaking(false);
                     }
-                } else if (attachDirection != null && isFaceClimbable(entity.getWorld(), entity.getBlockPos(), attachDirection)) {
-                    entity.setBodyYaw(attachDirection.asRotation());
-                    entity.prevBodyYaw = attachDirection.asRotation();
+                } else if (attachDirection != null) {
+                    if (isFaceClimbable(entity.getWorld(), entity.getBlockPos(), attachDirection)) {
+                        entity.setBodyYaw(attachDirection.asRotation());
+                        entity.prevBodyYaw = attachDirection.asRotation();
+                    } else {
+                        entity.setVelocity(vel);
+                        entity.isClimbing();
+                    }
                 }
             }
 
@@ -522,7 +527,9 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
     @Override
     public Optional<BlockPos> chooseClimbingPos() {
         if (getObservedSpecies() == Race.CHANGELING && getSpellSlot().get(SpellPredicate.IS_DISGUISE, false).isEmpty()) {
-            return Optional.of(entity.getBlockPos());
+            if (isFaceClimbable(entity.getWorld(), entity.getBlockPos(), entity.getHorizontalFacing()) || canHangAt(entity.getBlockPos())) {
+                return Optional.of(entity.getBlockPos());
+            }
         }
         return super.chooseClimbingPos();
     }