diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index c8d4b7eba..f71751087 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1734,8 +1734,7 @@ void LLAgent::stopAutoPilot(BOOL user_cancel)
 		// Sit response during follow pilot, now complete, resume follow
 		if (!user_cancel && mAutoPilotBehaviorName == "Sit" && mLeaderID.notNull())
 		{
-			mAutoPilotBehaviorName = "Follow";
-			mAutoPilot = true;
+			startFollowPilot(mLeaderID, true, gSavedSettings.getF32("SinguFollowDistance"));
 			return;
 		}