diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index d57068522..a4db5ef51 100644
--- a/mobile-widgets/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
@@ -83,7 +83,9 @@ Kirigami.Page {
 				model: null
 				currentIndex: productidx
 				onCurrentTextChanged: {
-					comboConnection.currentIndex = downloadThread.data().getMatchingAddress(comboVendor.currentText, currentText)
+					var newIdx = downloadThread.data().getMatchingAddress(comboVendor.currentText, currentText)
+					if (newIdx != -1)
+						comboConnection.currentIndex = newIdx
 				}
 
 				onModelChanged: {