diff --git a/man/ostree.repo-config.xml b/man/ostree.repo-config.xml
index a0cfd16477..5dc6b0e625 100644
--- a/man/ostree.repo-config.xml
+++ b/man/ostree.repo-config.xml
@@ -224,8 +224,8 @@ Boston, MA 02111-1307, USA.
local network, or the Internet. Possible values:
config, lan, and
mount (or any combination thereof). The default is
- to pull from all three, unless Avahi support was disabled at compile
- time, in which case lan is disabled.
+ to pull from the Internet and mounted filesystems, since the LAN finder
+ is more costly.
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 8cfe5564c6..dd1d1aef6d 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -5013,7 +5013,8 @@ ostree_repo_find_remotes_async (OstreeRepo *self,
default_finders[finder_index++] = finder_mount = OSTREE_REPO_FINDER (ostree_repo_finder_mount_new (NULL));
#ifdef HAVE_AVAHI
- if (self->repo_finders == NULL || g_strv_contains ((const char * const *)self->repo_finders, "lan"))
+ /* Only check the LAN if it was explicitly enabled (it's more expensive) */
+ if (self->repo_finders != NULL && g_strv_contains ((const char * const *)self->repo_finders, "lan"))
default_finders[finder_index++] = finder_avahi = OSTREE_REPO_FINDER (ostree_repo_finder_avahi_new (context));
#endif /* HAVE_AVAHI */