diff --git a/app/metrics.yaml b/app/metrics.yaml
index b025233e5..5073eece1 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -1648,7 +1648,8 @@ user_specified_search_engines:
     description: >
       A user deleted a custom search engine
     bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/5586
+      - https://github.com/mozilla-mobile/fenix/issues/5884
+      - https://github.com/mozilla-mobile/fenix/issues/7881
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/pull/6918
     notification_emails:
diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
index 5df878e3e..93e47bd0d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
@@ -129,7 +129,7 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
                 onItemTapped = {
                     when (it) {
                         is SearchEngineMenu.Item.Edit -> editCustomSearchEngine(engine)
-                        is SearchEngineMenu.Item.Delete -> deleteSearchEngine(context, engine)
+                        is SearchEngineMenu.Item.Delete -> deleteSearchEngine(context, engine, isCustomSearchEngine)
                     }
                 }
             ).menuBuilder.build(context).show(wrapper.overflow_menu)
@@ -162,7 +162,7 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
         Navigation.findNavController(searchEngineGroup!!).navigate(directions)
     }
 
-    private fun deleteSearchEngine(context: Context, engine: SearchEngine) {
+    private fun deleteSearchEngine(context: Context, engine: SearchEngine, isCustomSearchEngine: Boolean) {
         val isDefaultEngine = engine == context.components.search.provider.getDefaultEngine(context)
         val initialEngineList = searchEngineList.copy()
         val initialDefaultEngine = searchEngineList.default
@@ -192,7 +192,7 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
                         .getDefaultEngine(context)
                         .name
                 }
-                if (CustomSearchEngineStore.isCustomSearchEngine(context, engine.identifier)) {
+                if (isCustomSearchEngine) {
                     context.components.analytics.metrics.track(Event.CustomEngineDeleted)
                 }
                 refreshSearchEngineViews(context)