diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
index a15e32fa7618fdbde109d6f948550ede8f492734..2d8288ae0ee71152ad00c3190f82143215a79146 100644
--- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
@@ -195,7 +195,7 @@ void VCSBaseEditorParameterWidget::mapSetting(QComboBox *comboBox, QString *sett
         d->m_settingMapping.insert(comboBox, Internal::SettingMappingData(setting));
         if (setting) {
             comboBox->blockSignals(true);
-            const int itemIndex = comboBox->findData(*setting);
+            const int itemIndex = setting ? comboBox->findData(*setting) : -1;
             if (itemIndex != -1)
                 comboBox->setCurrentIndex(itemIndex);
             comboBox->blockSignals(false);