diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b22e0ffd8..f93a22ef0 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -181,10 +181,6 @@ limitations under the License.
             android:exported="false"
             android:grantUriPermissions="true" />
         <!-- Search suggestion provider -->
-        <provider
-            android:name=".content.SearchEngineProvider"
-            android:authorities="${applicationId}.search"
-            android:exported="false" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
index 0a052ffc0..de6f127e5 100644
--- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
@@ -21,7 +21,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
-import android.provider.SearchRecentSuggestions;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -48,7 +47,6 @@ import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.SearchEngine;
 import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
 import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
-import de.dennisguse.opentracks.content.SearchEngineProvider;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.content.Waypoint;
 import de.dennisguse.opentracks.content.Waypoint.WaypointType;
@@ -96,7 +94,6 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private SearchEngine searchEngine;
-    private SearchRecentSuggestions searchRecentSuggestions;
     private ArrayAdapter<Map<String, Object>> arrayAdapter;
     private boolean metricUnits = true;
     private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
@@ -169,7 +166,6 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM
         sharedPreferences = PreferencesUtils.getSharedPreferences(this);
         trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
         searchEngine = new SearchEngine(contentProviderUtils);
-        searchRecentSuggestions = SearchEngineProvider.newHelper(this);
 
         arrayAdapter = new ArrayAdapter<Map<String, Object>>(this, R.layout.list_item, R.id.list_item_name) {
             @NonNull
@@ -384,9 +380,6 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM
                 arrayAdapter.addAll(displayResults);
             }
         });
-
-        // Save the query as a suggestion for the future
-        searchRecentSuggestions.saveRecentQuery(query.textQuery, null);
     }
 
     /**
@@ -418,10 +411,7 @@ public class SearchListActivity extends AbstractTrackActivity implements DeleteM
      */
     @Deprecated
     private void prepareMarkerForDisplay(Waypoint waypoint, Map<String, Object> resultMap) {
-        /*
-         * TODO: It may be more appropriate to obtain the track name as a join in
-         * the retrieval phase of the search.
-         */
+        //TODO: It may be more appropriate to obtain the track name as a join in the retrieval phase of the search.
         String trackName = null;
         long trackId = waypoint.getTrackId();
         if (trackId != -1L) {
diff --git a/src/main/java/de/dennisguse/opentracks/content/SearchEngineProvider.java b/src/main/java/de/dennisguse/opentracks/content/SearchEngineProvider.java
deleted file mode 100644
index e73d2dd02..000000000
--- a/src/main/java/de/dennisguse/opentracks/content/SearchEngineProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks.content;
-
-import android.content.Context;
-import android.content.SearchRecentSuggestionsProvider;
-import android.provider.SearchRecentSuggestions;
-
-import de.dennisguse.opentracks.BuildConfig;
-
-/**
- * Content provider for search suggestions.
- *
- * @author Rodrigo Damazio
- */
-public class SearchEngineProvider extends SearchRecentSuggestionsProvider {
-
-    private static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".search";
-    private static final int MODE = DATABASE_MODE_QUERIES;
-
-    public SearchEngineProvider() {
-        setupSuggestions(AUTHORITY, MODE);
-    }
-
-    // TODO: Also add suggestions from the database.
-
-    /**
-     * Creates and returns a helper for adding recent queries or clearing the recent query history.
-     */
-    public static SearchRecentSuggestions newHelper(Context context) {
-        return new SearchRecentSuggestions(context, AUTHORITY, MODE);
-    }
-}