diff --git a/zone/client.cpp b/zone/client.cpp
index 8c4b42957..a270d6579 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -8756,6 +8756,11 @@ void Client::CheckRegionTypeChanges()
 	// still same region, do nothing
 	if (last_region_type == new_region)
 		return;
+	
+	// If we got out of water clear any water aggro for water only npcs
+	if (last_region_type == RegionTypeWater) {
+		entity_list.ClearWaterAggro(this);
+	}
 
 	// region type changed
 	last_region_type = new_region;