diff --git a/toolkit/components/search/SearchService.sys.mjs b/toolkit/components/search/SearchService.sys.mjs
index f46b5e3e22f1..7ed3f6c12103 100644
--- a/toolkit/components/search/SearchService.sys.mjs
+++ b/toolkit/components/search/SearchService.sys.mjs
@@ -2335,6 +2335,14 @@ export class SearchService {
           ? [e.identifier]
           : e.identifier.split("-");
 
+        if (e.identifier == "amazon-se") {
+          identifierComponents[1] = "sweden";
+        }
+
+        if (e.identifier == "amazon-es") {
+          identifierComponents[1] = "spain";
+        }
+
         let locale = identifierComponents.slice(1).join("-") || "default";
 
         e.webExtension.id = identifierComponents[0] + "@search.mozilla.org";