diff --git a/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp b/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
index 0ad40efbe..cf93d80a5 100644
--- a/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
+++ b/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
@@ -274,6 +274,9 @@ int main(int argc, char *argv[])
             }
             QByteArray fw;
             dfu.DownloadFirmware(&fw, 0);
+            while (!dfu.isFinished()) {
+                QThread::msleep(500);
+            }
             bool ret = dfu.SaveByteArrayToFile(file.toLatin1(), fw);
             return ret;
         } else if (action == DFU::actionCompareCrc) {