diff --git a/zone/water_map.h b/zone/water_map.h
index 1d6f6a34f..975703b40 100644
--- a/zone/water_map.h
+++ b/zone/water_map.h
@@ -34,6 +34,7 @@ public:
 	virtual bool InLava(const glm::vec3& location) const = 0;
 	virtual bool InLiquid(const glm::vec3& location) const = 0;
 	virtual bool InPvP(const glm::vec3& location) const = 0;
+	virtual bool InZoneLine(const glm::vec3& location) const = 0;
 
 protected:
 	virtual bool Load(FILE *fp) { return false; }
diff --git a/zone/water_map_v1.cpp b/zone/water_map_v1.cpp
index dd2e1539c..7d2479a3b 100644
--- a/zone/water_map_v1.cpp
+++ b/zone/water_map_v1.cpp
@@ -34,6 +34,10 @@ bool WaterMapV1::InPvP(const glm::vec3& location) const {
 	return ReturnRegionType(location) == RegionTypePVP;
 }
 
+bool WaterMapV1::InZoneLine(const glm::vec3& location) const {
+	return ReturnRegionType(location) == RegionTypeZoneLine;
+}
+
 bool WaterMapV1::Load(FILE *fp) {
 	uint32 bsp_tree_size;
 	if (fread(&bsp_tree_size, sizeof(bsp_tree_size), 1, fp) != 1) {
diff --git a/zone/water_map_v1.h b/zone/water_map_v1.h
index e4cb167d7..af4d4966f 100644
--- a/zone/water_map_v1.h
+++ b/zone/water_map_v1.h
@@ -25,6 +25,7 @@ public:
 	virtual bool InLava(const glm::vec3& location) const;
 	virtual bool InLiquid(const glm::vec3& location) const;
 	virtual bool InPvP(const glm::vec3& location) const;
+	virtual bool InZoneLine(const glm::vec3& location) const;
 	
 protected:
 	virtual bool Load(FILE *fp);
diff --git a/zone/water_map_v2.cpp b/zone/water_map_v2.cpp
index 48383fe3c..939b9be97 100644
--- a/zone/water_map_v2.cpp
+++ b/zone/water_map_v2.cpp
@@ -37,6 +37,10 @@ bool WaterMapV2::InPvP(const glm::vec3& location) const {
 	return ReturnRegionType(location) == RegionTypePVP;
 }
 
+bool WaterMapV2::InZoneLine(const glm::vec3& location) const {
+	return ReturnRegionType(location) == RegionTypeZoneLine;
+}
+
 bool WaterMapV2::Load(FILE *fp) {
 	uint32 region_count;
 	if (fread(&region_count, sizeof(region_count), 1, fp) != 1) {
diff --git a/zone/water_map_v2.h b/zone/water_map_v2.h
index 523191fe3..704d1a119 100644
--- a/zone/water_map_v2.h
+++ b/zone/water_map_v2.h
@@ -18,6 +18,7 @@ public:
 	virtual bool InLava(const glm::vec3& location) const;
 	virtual bool InLiquid(const glm::vec3& location) const;
 	virtual bool InPvP(const glm::vec3& location) const;
+	virtual bool InZoneLine(const glm::vec3& location) const;
 
 protected:
 	virtual bool Load(FILE *fp);
diff --git a/zone/zone.cpp b/zone/zone.cpp
index df48d0cfa..1165d7e9b 100644
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -1594,7 +1594,9 @@ ZonePoint* Zone::GetClosestZonePoint(const glm::vec3& location, uint32 to, Clien
 		iterator.Advance();
 	}
 
-	if(closest_dist > 400.0f && closest_dist < max_distance2)
+	// if we have a water map and it says we're in a zoneline, lets assume it's just a really big zone line
+	// this shouldn't open up any exploits since those situations are detected later on
+	if ((zone->HasWaterMap() && !zone->watermap->InZoneLine(glm::vec3(client->GetPosition()))) || (!zone->HasWaterMap() && closest_dist > 400.0f && closest_dist < max_distance2))
 	{
 		if(client)
 			client->CheatDetected(MQZoneUnknownDest, location.x, location.y, location.z); // Someone is trying to use /zone