diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index 97b76c8f1..17d2c44a4 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -537,10 +537,12 @@ void ConfigureDiveComputerDialog::on_DiveComputerList_currentRowChanged(int curr
 	case 0:
 		selected_vendor = "Heinrichs Weikamp";
 		selected_product = "OSTC 3";
+		ui->updateFirmwareButton->setEnabled(true);
 		break;
 	case 1:
 		selected_vendor = "Suunto";
 		selected_product = "Vyper";
+		ui->updateFirmwareButton->setEnabled(false);
 		break;
 	default:
 		/* Not Supported */
diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index f736bd393..73fb29e88 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -103,6 +103,9 @@
      </item>
      <item>
       <widget class="QPushButton" name="updateFirmwareButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="text">
         <string>Update firmware</string>
        </property>