diff --git a/app/src/foss/res/values-de/values.xml b/app/src/foss/res/values-de/values.xml
index 29f8d793..112a5827 100644
--- a/app/src/foss/res/values-de/values.xml
+++ b/app/src/foss/res/values-de/values.xml
@@ -3,6 +3,12 @@
     <string-array name="pref_map_provider_names">
         <item>OpenStreetMap (Mapbox)</item>
     </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" tranlatable="false">
+        <item>mapbox</item>
+    </string-array>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 30% Gebühren ab.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/foss/res/values/values.xml b/app/src/foss/res/values/values.xml
index eb107ce7..3fcbe8f9 100644
--- a/app/src/foss/res/values/values.xml
+++ b/app/src/foss/res/values/values.xml
@@ -6,6 +6,13 @@
     <string-array name="pref_map_provider_values" tranlatable="false">
         <item>mapbox</item>
     </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" tranlatable="false">
+        <item>mapbox</item>
+    </string-array>
+    <string name="pref_search_provider_default" translatable="false">mapbox</string>
     <string name="pref_map_provider_default" translatable="false">mapbox</string>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
     <string name="donate_paypal">Donate with PayPal</string>
diff --git a/app/src/google/java/net/vonforst/evmap/autocomplete/Autocomplete.kt b/app/src/google/java/net/vonforst/evmap/autocomplete/Autocomplete.kt
index 2e1e9fb5..ed0ef8fd 100644
--- a/app/src/google/java/net/vonforst/evmap/autocomplete/Autocomplete.kt
+++ b/app/src/google/java/net/vonforst/evmap/autocomplete/Autocomplete.kt
@@ -1,6 +1,11 @@
 package net.vonforst.evmap.autocomplete
 
 import android.content.Context
+import net.vonforst.evmap.storage.PreferenceDataSource
 
 fun getAutocompleteProviders(context: Context) =
-    listOf(GooglePlacesAutocompleteProvider(context), MapboxAutocompleteProvider(context))
\ No newline at end of file
+    if (PreferenceDataSource(context).searchProvider == "google") {
+        listOf(GooglePlacesAutocompleteProvider(context), MapboxAutocompleteProvider(context))
+    } else {
+        listOf(MapboxAutocompleteProvider(context), GooglePlacesAutocompleteProvider(context))
+    }
\ No newline at end of file
diff --git a/app/src/google/res/values-de/values.xml b/app/src/google/res/values-de/values.xml
index 80fcd250..8c857f77 100644
--- a/app/src/google/res/values-de/values.xml
+++ b/app/src/google/res/values-de/values.xml
@@ -4,6 +4,10 @@
         <item>Google Maps</item>
         <item>OpenStreetMap (Mapbox)</item>
     </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>Google Maps</item>
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 15% Gebühren ab.</string>
     <string name="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
     <string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
diff --git a/app/src/google/res/values/values.xml b/app/src/google/res/values/values.xml
index 9daabda0..f7114f10 100644
--- a/app/src/google/res/values/values.xml
+++ b/app/src/google/res/values/values.xml
@@ -8,7 +8,16 @@
         <item>google</item>
         <item>mapbox</item>
     </string-array>
+    <string-array name="pref_search_provider_names">
+        <item>Google Maps</item>
+        <item>OpenStreetMap (Mapbox)</item>
+    </string-array>
+    <string-array name="pref_search_provider_values" tranlatable="false">
+        <item>google</item>
+        <item>mapbox</item>
+    </string-array>
     <string name="pref_map_provider_default" translatable="false">google</string>
+    <string name="pref_search_provider_default" translatable="false">mapbox</string>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
     <string name="auto_location_service">EVMap is running on Android Auto and using your location.</string>
     <string name="auto_no_chargers_found">No nearby chargers found</string>
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/SettingsFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/SettingsFragment.kt
index c5e9de92..a42bbdf1 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/SettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/SettingsFragment.kt
@@ -3,6 +3,7 @@ package net.vonforst.evmap.fragment
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -122,6 +123,12 @@ class SettingsFragment : PreferenceFragmentCompat(),
             "chargeprice_my_tariffs" -> {
                 updateMyTariffsSummary()
             }
+            "search_provider" -> {
+                if (prefs.searchProvider == "google") {
+                    Toast.makeText(context, R.string.pref_search_provider_info, Toast.LENGTH_LONG)
+                        .show()
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
index 26ab682f..e8dac2bc 100644
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -80,6 +80,12 @@ class PreferenceDataSource(val context: Context) {
             context.getString(R.string.pref_map_provider_default)
         )!!
 
+    val searchProvider: String
+        get() = sp.getString(
+            "search_provider",
+            context.getString(R.string.pref_search_provider_default)
+        )!!
+
     var mapType: AnyMap.Type
         get() = AnyMap.Type.valueOf(sp.getString("map_type", null) ?: AnyMap.Type.NORMAL.toString())
         set(type) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3d04688f..db237a60 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -234,4 +234,6 @@
     <string name="crash_report_text">Sorry, anscheinend ist EVMap abgestürzt. Bitte schicke einen Fehlerbericht an den Entwickler.</string>
     <string name="crash_report_comment_prompt">Du kannst unten noch einen Kommentar hinzufügen:</string>
     <string name="powered_by_mapbox">powered by Mapbox</string>
+    <string name="pref_search_provider">Anbieter für Ortssuche</string>
+    <string name="pref_search_provider_info"><![CDATA[Die Daten für die Ortssuche, vor allem von Google Maps, sind relativ teuer. Wenn du diese Funktion häufig nutzt, würde ich mich über eine Spende unter \"Über EVMap -> Spenden\" sehr freuen.]]></string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49665f31..19f288f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,4 +219,6 @@
     <string name="crash_report_text">Sorry, it seems that EVMap has crashed. Please send a crash report to the developer.</string>
     <string name="crash_report_comment_prompt">You can add a comment below:</string>
     <string name="powered_by_mapbox">powered by Mapbox</string>
+    <string name="pref_search_provider">Place search provider</string>
+    <string name="pref_search_provider_info"><![CDATA[Data for place search, especially from Google Maps, is relatively expensive. If you use this feature often, please consider making a donation through \"About EVMap -> Donate\".]]></string>
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 0352d0cb..7ed57267 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -39,6 +39,14 @@
             android:defaultValue="@string/pref_map_provider_default"
             android:summary="%s" />
 
+        <ListPreference
+            android:key="search_provider"
+            android:title="@string/pref_search_provider"
+            android:entries="@array/pref_search_provider_names"
+            android:entryValues="@array/pref_search_provider_values"
+            android:defaultValue="@string/pref_search_provider_default"
+            android:summary="%s" />
+
         <CheckBoxPreference
             android:key="navigate_use_maps"
             android:title="@string/pref_navigate_use_maps"