--- a/toolkit/components/extensions/parent/ext-cookies.js
+++ b/toolkit/components/extensions/parent/ext-cookies.js
@@ -169,36 +169,43 @@ const query = function* (detailsIn, prop
   if (isPrivate) {
     storeId = PRIVATE_STORE;
   } else if ("storeId" in details) {
     storeId = details.storeId;
   }
 
   // We can use getCookiesFromHost for faster searching.
   let enumerator;
+  let host;
   let url;
   let originAttributes = {
     userContextId,
     privateBrowsingId: isPrivate ? 1 : 0,
   };
   if ("firstPartyDomain" in details) {
     originAttributes.firstPartyDomain = details.firstPartyDomain;
   }
   if ("url" in details) {
     try {
       url = new URL(details.url);
-      enumerator = Services.cookies.getCookiesFromHost(url.hostname, originAttributes);
+      host = url.hostname;
     } catch (ex) {
       // This often happens for about: URLs
       return;
     }
   } else if ("domain" in details) {
-    enumerator = Services.cookies.getCookiesFromHost(details.domain, originAttributes);
+    host = details.domain;
+  }
+
+  if (host && ("firstPartyDomain" in originAttributes)) {
+    // getCookiesFromHost is more efficient than getCookiesWithOriginAttributes
+    // if the host and all origin attributes are known.
+    enumerator = Services.cookies.getCookiesFromHost(host, originAttributes);
   } else {
-    enumerator = Services.cookies.getCookiesWithOriginAttributes(JSON.stringify(originAttributes));
+    enumerator = Services.cookies.getCookiesWithOriginAttributes(JSON.stringify(originAttributes), host);
   }
 
   // Based on nsCookieService::GetCookieStringInternal
   function matches(cookie) {
     function domainMatches(host) {
       return cookie.rawHost == host || (cookie.isDomain && host.endsWith(cookie.host));
     }
 

--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html
@@ -78,38 +78,41 @@ async function background() {
     cookie = await browser.cookies.get({url, name: "foo2", firstPartyDomain: ""});
     assertExpectedCookies([null], [cookie], "get: FPI off, w/ empty firstPartyDomain, no cookie");
     cookie = await browser.cookies.get({url, name: "foo2", firstPartyDomain: null});
     assertExpectedCookies([null], [cookie], "get: FPI off, w/ null firstPartyDomain, no cookie");
     cookie = await browser.cookies.get({url, name: "foo2", firstPartyDomain: undefined});
     assertExpectedCookies([null], [cookie], "get: FPI off, w/ undefined firstPartyDomain, no cookie");
 
     // getAll
-    cookies = await browser.cookies.getAll({});
-    assertExpectedCookies([
-      {name: "foo1", value: "bar1", firstPartyDomain: ""},
-    ], cookies, "getAll: FPI off, w/o firstPartyDomain, non-FP cookies");
-    cookies = await browser.cookies.getAll({firstPartyDomain: ""});
-    assertExpectedCookies([
-      {name: "foo1", value: "bar1", firstPartyDomain: ""},
-    ], cookies, "getAll: FPI off, w/ empty firstPartyDomain, non-FP cookies");
-    cookies = await browser.cookies.getAll({firstPartyDomain: null});
-    assertExpectedCookies([
-      {name: "foo1", value: "bar1", firstPartyDomain: ""},
-      {name: "foo2", value: "bar2", firstPartyDomain},
-    ], cookies, "getAll: FPI off, w/ null firstPartyDomain, all cookies");
-    cookies = await browser.cookies.getAll({firstPartyDomain: undefined});
-    assertExpectedCookies([
-      {name: "foo1", value: "bar1", firstPartyDomain: ""},
-      {name: "foo2", value: "bar2", firstPartyDomain},
-    ], cookies, "getAll: FPI off, w/ undefined firstPartyDomain, all cookies");
-    cookies = await browser.cookies.getAll({firstPartyDomain});
-    assertExpectedCookies([
-      {name: "foo2", value: "bar2", firstPartyDomain},
-    ], cookies, "getAll: FPI off, w/ firstPartyDomain, FP cookies");
+    for (let extra of [{}, {url}, {domain: firstPartyDomain}]) {
+      const prefix = `getAll(${JSON.stringify(extra)})`;
+      cookies = await browser.cookies.getAll({...extra});
+      assertExpectedCookies([
+        {name: "foo1", value: "bar1", firstPartyDomain: ""},
+      ], cookies, `${prefix}: FPI off, w/o firstPartyDomain, non-FP cookies`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain: ""});
+      assertExpectedCookies([
+        {name: "foo1", value: "bar1", firstPartyDomain: ""},
+      ], cookies, `${prefix}: FPI off, w/ empty firstPartyDomain, non-FP cookies`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain: null});
+      assertExpectedCookies([
+        {name: "foo1", value: "bar1", firstPartyDomain: ""},
+        {name: "foo2", value: "bar2", firstPartyDomain},
+      ], cookies, `${prefix}: FPI off, w/ null firstPartyDomain, all cookies`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain: undefined});
+      assertExpectedCookies([
+        {name: "foo1", value: "bar1", firstPartyDomain: ""},
+        {name: "foo2", value: "bar2", firstPartyDomain},
+      ], cookies, `${prefix}: FPI off, w/ undefined firstPartyDomain, all cookies`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain});
+      assertExpectedCookies([
+        {name: "foo2", value: "bar2", firstPartyDomain},
+      ], cookies, `${prefix}: FPI off, w/ firstPartyDomain, FP cookies`);
+    }
 
     // remove
     cookie = await browser.cookies.remove({url, name: "foo1"});
     assertExpectedCookies([
       {url, name: "foo1", firstPartyDomain: ""},
     ], [cookie], "remove: FPI off, w/ empty firstPartyDomain, non-FP cookie");
     cookie = await browser.cookies.remove({url, name: "foo2", firstPartyDomain});
     assertExpectedCookies([
@@ -159,41 +162,44 @@ async function background() {
       {name: "foo4", value: "bar4", firstPartyDomain},
     ], [cookie], "get: FPI on, w/ firstPartyDomain, FP cookie");
     cookie = await browser.cookies.get({url, name: "foo2", firstPartyDomain});
     assertExpectedCookies([
       {name: "foo2", value: "bar2", firstPartyDomain},
     ], [cookie], "get: FPI on, w/ firstPartyDomain, FP cookie (set when FPI off)");
 
     // getAll
-    await browser.test.assertRejects(
-      browser.cookies.getAll({}),
-      expectedError,
-      "getAll: FPI on, w/o firstPartyDomain, rejection");
-    cookies = await browser.cookies.getAll({firstPartyDomain: ""});
-    assertExpectedCookies([
-      {name: "foo1", value: "bar1", firstPartyDomain: ""},
-    ], cookies, "getAll: FPI on, w/ empty firstPartyDomain, non-FP cookies");
-    cookies = await browser.cookies.getAll({firstPartyDomain: null});
-    assertExpectedCookies([
-      {name: "foo1", value: "bar1", firstPartyDomain: ""},
-      {name: "foo2", value: "bar2", firstPartyDomain},
-      {name: "foo4", value: "bar4", firstPartyDomain},
-    ], cookies, "getAll: FPI on, w/ null firstPartyDomain, all cookies");
-    cookies = await browser.cookies.getAll({firstPartyDomain: undefined});
-    assertExpectedCookies([
-      {name: "foo1", value: "bar1", firstPartyDomain: ""},
-      {name: "foo2", value: "bar2", firstPartyDomain},
-      {name: "foo4", value: "bar4", firstPartyDomain},
-    ], cookies, "getAll: FPI on, w/ undefined firstPartyDomain, all cookies");
-    cookies = await browser.cookies.getAll({firstPartyDomain});
-    assertExpectedCookies([
-      {name: "foo2", value: "bar2", firstPartyDomain},
-      {name: "foo4", value: "bar4", firstPartyDomain},
-    ], cookies, "getAll: FPI on, w/ firstPartyDomain, FP cookies");
+    for (let extra of [{}, {url}, {domain: firstPartyDomain}]) {
+      const prefix = `getAll(${JSON.stringify(extra)})`;
+      await browser.test.assertRejects(
+        browser.cookies.getAll({...extra}),
+        expectedError,
+        `${prefix}: FPI on, w/o firstPartyDomain, rejection`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain: ""});
+      assertExpectedCookies([
+        {name: "foo1", value: "bar1", firstPartyDomain: ""},
+      ], cookies, `${prefix}: FPI on, w/ empty firstPartyDomain, non-FP cookies`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain: null});
+      assertExpectedCookies([
+        {name: "foo1", value: "bar1", firstPartyDomain: ""},
+        {name: "foo2", value: "bar2", firstPartyDomain},
+        {name: "foo4", value: "bar4", firstPartyDomain},
+      ], cookies, `${prefix}: FPI on, w/ null firstPartyDomain, all cookies`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain: undefined});
+      assertExpectedCookies([
+        {name: "foo1", value: "bar1", firstPartyDomain: ""},
+        {name: "foo2", value: "bar2", firstPartyDomain},
+        {name: "foo4", value: "bar4", firstPartyDomain},
+      ], cookies, `${prefix}: FPI on, w/ undefined firstPartyDomain, all cookies`);
+      cookies = await browser.cookies.getAll({...extra, firstPartyDomain});
+      assertExpectedCookies([
+        {name: "foo2", value: "bar2", firstPartyDomain},
+        {name: "foo4", value: "bar4", firstPartyDomain},
+      ], cookies, `${prefix}: FPI on, w/ firstPartyDomain, FP cookies`);
+    }
 
     // remove
     await browser.test.assertRejects(
       browser.cookies.remove({url, name: "foo3"}),
       expectedError,
       "remove: FPI on, w/o firstPartyDomain, rejection");
     cookie = await browser.cookies.remove({url, name: "foo4", firstPartyDomain});
     assertExpectedCookies([