diff --git a/minetest.conf.example b/minetest.conf.example
index fad3716d2..cf27acfac 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -131,6 +131,8 @@
 #default_password = 
 # Available privileges: build, teleport, settime, privs, shout
 #default_privs = build, shout
+# Whether players are transferred to client without any range limit
+#unlimited_player_transfer_distance = true
 
 # Profiler data print interval. #0 = disable.
 #profiler_print_interval = 0
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 97adf0da6..be63fb870 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -93,6 +93,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("give_initial_stuff", "false");
 	settings->setDefault("default_password", "");
 	settings->setDefault("default_privs", "build, shout");
+	settings->setDefault("unlimited_player_transfer_distance", "true");
 
 	settings->setDefault("profiler_print_interval", "0");
 	settings->setDefault("enable_mapgen_debug_info", "false");
diff --git a/src/serverremoteplayer.cpp b/src/serverremoteplayer.cpp
index c5033da50..bff414e1a 100644
--- a/src/serverremoteplayer.cpp
+++ b/src/serverremoteplayer.cpp
@@ -88,7 +88,7 @@ void ServerRemotePlayer::removingFromEnvironment()
 
 bool ServerRemotePlayer::unlimitedTransferDistance() const
 {
-	return true;
+	return g_settings->getBool("unlimited_player_transfer_distance");
 }
 
 void ServerRemotePlayer::step(float dtime, bool send_recommended)