diff --git a/src/DownloadCommand.cc b/src/DownloadCommand.cc
index 99a0f85d..11e94dc4 100644
--- a/src/DownloadCommand.cc
+++ b/src/DownloadCommand.cc
@@ -306,9 +306,11 @@ bool DownloadCommand::prepareForNextSegment() {
         getDownloadEngine()->getCheckIntegrityMan()->pushEntry(entry);
       }
     }
+#endif // ENABLE_MESSAGE_DIGEST
+    // Following 2lines are needed for DownloadEngine to detect
+    // completed RequestGroups without 1sec delay.
     getDownloadEngine()->setNoWait(true);
     getDownloadEngine()->setRefreshInterval(0);
-#endif // ENABLE_MESSAGE_DIGEST
     return true;
   } else {
     // The number of segments should be 1 in order to pass through the next