diff --git a/src/command_local.cc b/src/command_local.cc
index bec708bc..56255fb7 100644
--- a/src/command_local.cc
+++ b/src/command_local.cc
@@ -310,7 +310,7 @@ initialize_command_local() {
   CMD2_VAR_C_STRING("system.client_version",        PACKAGE_VERSION);
   CMD2_VAR_C_STRING("system.library_version",       torrent::version());
   CMD2_VAR_VALUE   ("system.file.allocate",         0);
-  CMD2_VAR_VALUE   ("system.file.max_size",         -1);
+  CMD2_VAR_VALUE   ("system.file.max_size",         (int64_t)64 << 30);
   CMD2_VAR_VALUE   ("system.file.split_size",       -1);
   CMD2_VAR_STRING  ("system.file.split_suffix",     ".part");
 
diff --git a/src/core/download_factory.cc b/src/core/download_factory.cc
index cfc22972..9e5da4b9 100644
--- a/src/core/download_factory.cc
+++ b/src/core/download_factory.cc
@@ -257,6 +257,7 @@ DownloadFactory::receive_success() {
   rpc::call_command("d.peers_min.set",        rpc::call_command_void("throttle.min_peers.normal"), rpc::make_target(download));
   rpc::call_command("d.peers_max.set",        rpc::call_command_void("throttle.max_peers.normal"), rpc::make_target(download));
   rpc::call_command("d.tracker_numwant.set",  rpc::call_command_void("trackers.numwant"), rpc::make_target(download));
+  rpc::call_command("d.max_file_size.set",    rpc::call_command_void("system.file.max_size"), rpc::make_target(download));
 
   if (rpc::call_command_value("d.complete", rpc::make_target(download)) != 0) {
     if (rpc::call_command_value("throttle.min_peers.seed") >= 0)
@@ -269,9 +270,6 @@ DownloadFactory::receive_success() {
   if (!rpc::call_command_value("trackers.use_udp"))
     download->enable_udp_trackers(false);
 
-  if (rpc::call_command_value("system.file.max_size") > 0)
-    rpc::call_command("d.max_file_size.set", rpc::call_command_void("system.file.max_size"), rpc::make_target(download));
-
   // Check first if we already have these values set in the session
   // torrent, so that it is safe to change the values.
   //