diff --git a/src/QGCConfig.h b/src/QGCConfig.h
index d8de5c896273c2e0fb1ad811c0ace4ca6a4aa7d9..f3457b53c66d358bc64209ad42303db73691ae60 100644
--- a/src/QGCConfig.h
+++ b/src/QGCConfig.h
@@ -10,6 +10,6 @@
 
 // If you need to make an incompatible changes to stored settings, bump this version number
 // up by 1. This will caused store settings to be cleared on next boot.
-#define QGC_SETTINGS_VERSION 8
+#define QGC_SETTINGS_VERSION 9
 
 #endif // QGC_CONFIGURATION_H
diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml
index 0b04a2949a8a83d69e2c09e4dfcbc0f77101272e..7c7552fc787f289ad1ebc2d7f45e9e7a2404f0e1 100644
--- a/src/ui/preferences/GeneralSettings.qml
+++ b/src/ui/preferences/GeneralSettings.qml
@@ -173,6 +173,7 @@ Rectangle {
                                     }
                                     Component.onCompleted: {
                                         var index = mapCombo.find(_mapProvider)
+                                        if(index < 0) index = 0
                                         mapCombo.currentIndex = index
                                     }
                                 }
@@ -190,6 +191,7 @@ Rectangle {
                                     }
                                     Component.onCompleted: {
                                         var index = mapTypeCombo.find(_mapType)
+                                        if(index < 0) index = 0
                                         mapTypeCombo.currentIndex = index
                                     }
                                 }