diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp
index a356a767a..7f5fd4a46 100644
--- a/qt-ui/downloadfromdivecomputer.cpp
+++ b/qt-ui/downloadfromdivecomputer.cpp
@@ -403,7 +403,7 @@ void DownloadFromDCWidget::onDownloadThreadFinished()
 			MainWindow::instance()->dive_list()->unselectDives();
 			MainWindow::instance()->dive_list()->selectDive(idx, true);
 			QString dcName = data.devname;
-			if (ostcFirmwareCheck)
+			if (ostcFirmwareCheck && currentState == DONE)
 				ostcFirmwareCheck->checkLatest(this, &data);
 		}
 	} else if (currentState == CANCELLING || currentState == CANCELLED) {