diff --git a/common/src/comp/mod.rs b/common/src/comp/mod.rs
index 3efd7e9381..8ab32575f6 100644
--- a/common/src/comp/mod.rs
+++ b/common/src/comp/mod.rs
@@ -43,7 +43,7 @@ pub use last::Last;
 pub use location::{Waypoint, WaypointArea};
 pub use misc::Object;
 pub use phys::{Collider, ForceUpdate, Gravity, Mass, Ori, PhysicsState, Pos, Scale, Sticky, Vel};
-pub use player::Player;
+pub use player::{Player, MAX_MOUNT_RANGE_SQR};
 pub use projectile::Projectile;
 pub use skills::{Skill, SkillGroup, SkillGroupType, SkillSet};
 pub use stats::{Exp, HealthChange, HealthSource, Level, Stats};
diff --git a/common/src/comp/player.rs b/common/src/comp/player.rs
index 0527b20284..3c4bbe2002 100644
--- a/common/src/comp/player.rs
+++ b/common/src/comp/player.rs
@@ -4,6 +4,7 @@ use specs::{Component, FlaggedStorage, NullStorage};
 use specs_idvs::IdvStorage;
 
 const MAX_ALIAS_LEN: usize = 32;
+pub const MAX_MOUNT_RANGE_SQR: i32 = 20000;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Player {
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index b2a042f1af..4467882f47 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -15,7 +15,7 @@ use common::{
     assets::{load_expect, load_watched, watch},
     clock::Clock,
     comp,
-    comp::{ChatMsg, ChatType, InventoryUpdateEvent, Pos, Vel, MAX_PICKUP_RANGE_SQR},
+    comp::{ChatMsg, ChatType, InventoryUpdateEvent, Pos, Vel, MAX_MOUNT_RANGE_SQR, MAX_PICKUP_RANGE_SQR},
     event::EventBus,
     msg::ClientState,
     terrain::{Block, BlockKind},
@@ -430,25 +430,32 @@ impl PlayState for SessionState {
                                 .copied();
                             if let Some(player_pos) = player_pos {
                                 // Find closest mountable entity
-                                let closest_mountable = (
+                                let mut closest_mountable: Option<(specs::Entity, i32)> = None;
+
+                                for (uid, pos, ms) in (
                                     &client.state().ecs().entities(),
                                     &client.state().ecs().read_storage::<comp::Pos>(),
                                     &client.state().ecs().read_storage::<comp::MountState>(),
-                                )
-                                    .join()
-                                    .filter(|(_, _, ms)| {
-                                        if let comp::MountState::Unmounted = ms {
-                                            true
-                                        } else {
-                                            false
-                                        }
-                                    })
-                                    .min_by_key(|(_, pos, _)| {
-                                        (player_pos.0.distance_squared(pos.0) * 1000.0) as i32
-                                    })
-                                    .map(|(uid, _, _)| uid);
+                                ).join() {
+                                    if comp::MountState::Unmounted != *ms {
+                                        continue;
+                                    }
 
-                                if let Some(mountee_entity) = closest_mountable {
+                                    let dist = (player_pos.0.distance_squared(pos.0) * 1000.0) as i32;
+                                    if MAX_MOUNT_RANGE_SQR < dist {
+                                        continue;
+                                    }
+
+                                    if let Some(previous) = closest_mountable.as_mut() {
+                                        if dist < previous.1 {
+                                            *previous = (uid, dist);
+                                        }
+                                    } else {
+                                        closest_mountable = Some((uid, dist));
+                                    }
+                                }
+
+                                if let Some((mountee_entity, _)) = closest_mountable {
                                     client.mount(mountee_entity);
                                 }
                             }