diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 657e464cbb912049e91b5d13744b64a27d3a4e08..1132ee4ea8179a981d0af73b165b748269393786 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3661,6 +3661,9 @@ void LLAgent::setTeleportState(ETeleportState state)
 
 		// Let the interested parties know we've teleported.
 		LLViewerParcelMgr::getInstance()->onTeleportFinished(false, getPositionGlobal());
+
+		//Since we teleported into a new region, we need to cleanup up any navmesh residuals
+		if ( LLPathingLib::getInstance() ) { LLPathingLib::getInstance()->cleanupResidual(); }
 			break;
 
 		default: