diff --git a/src/landscape.cpp b/src/landscape.cpp
index 5eb645daf3..c943ba8127 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -1235,6 +1235,7 @@ static void BuildRiver(TileIndex begin, TileIndex end)
 	finder.EndNodeCheck = River_EndNodeCheck;
 	finder.FoundEndNode = River_FoundEndNode;
 	finder.user_target = &end;
+	finder.max_search_nodes = AYSTAR_DEF_MAX_SEARCH_NODES;
 
 	finder.Init(1 << RIVER_HASH_SIZE);
 
diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/npf/aystar.cpp
index 2a4436dca2..227c73d389 100644
--- a/src/pathfinder/npf/aystar.cpp
+++ b/src/pathfinder/npf/aystar.cpp
@@ -315,7 +315,4 @@ void AyStar::Init(uint num_buckets)
 	 *  When that one gets full it reserves another one, till this number
 	 *  That is why it can stay this high */
 	this->openlist_queue.Init(102400);
-
-	/* Set a reasonable default limit */
-	this->max_search_nodes = AYSTAR_DEF_MAX_SEARCH_NODES;
 }