diff --git a/src/BtFileAllocationEntry.cc b/src/BtFileAllocationEntry.cc
index c026e296..8ef15265 100644
--- a/src/BtFileAllocationEntry.cc
+++ b/src/BtFileAllocationEntry.cc
@@ -82,11 +82,13 @@ void BtFileAllocationEntry::prepareForNextAction(
       rg->createNextCommandWithAdj(commands, e, 0);
     }
 
-    try {
-      rg->saveControlFile();
-    }
-    catch (RecoverableException& e) {
-      A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e);
+    if (option->getAsInt(PREF_AUTO_SAVE_INTERVAL) != 0) {
+      try {
+        rg->saveControlFile();
+      }
+      catch (RecoverableException& e) {
+        A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e);
+      }
     }
   }
   else {
diff --git a/src/StreamFileAllocationEntry.cc b/src/StreamFileAllocationEntry.cc
index 97011dd1..29e1979e 100644
--- a/src/StreamFileAllocationEntry.cc
+++ b/src/StreamFileAllocationEntry.cc
@@ -99,7 +99,8 @@ void StreamFileAllocationEntry::prepareForNextAction(
     rg->createNextCommandWithAdj(commands, e, 0);
   }
 
-  if (!rg->allDownloadFinished()) {
+  if (option->getAsInt(PREF_AUTO_SAVE_INTERVAL) != 0 &&
+      !rg->allDownloadFinished()) {
     try {
       rg->saveControlFile();
     }