diff --git a/tools/nitpick/src/ui/Nitpick.cpp b/tools/nitpick/src/ui/Nitpick.cpp
index 8893173284..a4aef8fad5 100644
--- a/tools/nitpick/src/ui/Nitpick.cpp
+++ b/tools/nitpick/src/ui/Nitpick.cpp
@@ -246,6 +246,10 @@ void Nitpick::downloadFiles(const QStringList& URLs, const QString& directoryNam
     _ui.progressBar->setValue(0);
     _ui.progressBar->setVisible(true);
 
+    foreach (auto downloader, _downloaders) {
+        delete downloader;
+    }
+
     _downloaders.clear();
     for (int i = 0; i < _numberOfFilesToDownload; ++i) {
         downloadFile(URLs[i]);
@@ -273,10 +277,6 @@ void Nitpick::saveFile(int index) {
         } else if (_caller == _testRunner) {
             _testRunner->downloadComplete();
         }
-
-        foreach (auto downloader, _downloaders) {
-            delete downloader;
-        }
     } else {
         _ui.progressBar->setValue(_numberOfFilesDownloaded);
     }