diff --git a/api/services/domain/[query].ts b/api/services/domain/[query].ts
index 6d078a8..4cb93d8 100644
--- a/api/services/domain/[query].ts
+++ b/api/services/domain/[query].ts
@@ -1,6 +1,6 @@
 import { VercelRequest, VercelResponse } from '@vercel/node';
 import 'cross-fetch';
-import whois from 'whois-json';
+import whoiser from 'whoiser';
 import { send, sendError } from '../../../util/http';
 
 export default async function handler(
@@ -14,9 +14,17 @@ export default async function handler(
   }
 
   try {
-    const response = await whois(query, { follow: 3, verbose: true });
-    const availability = response[0].data.domainName ? false : true;
-    send(res, { availability });
+    const response = await whoiser(query, { follow: 1, timeout: 5000 });
+    const first = Object.values<any>(response)[0];
+    if (first.error) {
+      throw new Error(`Got error while querying for ${query}: ${first.error}`);
+    }
+    try {
+      const availability = first['Domain Status'].length > 0 ? false : true;
+      send(res, { availability });
+    } catch (err) {
+      console.log(response);
+    }
   } catch (err: any) {
     sendError(res, err);
   }
diff --git a/package.json b/package.json
index 4334542..30f72aa 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "styled-components": "^5.3.5",
     "swr": "^1.2.2",
     "validator": "^13.7.0",
-    "whois-json": "^2.0.4"
+    "whoiser": "^1.13.1"
   },
   "devDependencies": {
     "@sentry/cli": "^1.74.2",
diff --git a/src/components/cards/providers/FirefoxAddons.tsx b/src/components/cards/providers/FirefoxAddons.tsx
index 8658ad9..9b7cb4c 100644
--- a/src/components/cards/providers/FirefoxAddons.tsx
+++ b/src/components/cards/providers/FirefoxAddons.tsx
@@ -2,7 +2,6 @@ import useFetch from 'fetch-suspense';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaFirefoxBrowser } from 'react-icons/fa';
-import { RiChromeFill } from 'react-icons/ri';
 import { Card, Result } from '../core';
 
 const Search: React.FC<{ query: string }> = ({ query }) => {
diff --git a/yarn.lock b/yarn.lock
index 872598c..641886a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10541,6 +10541,13 @@ whois@^2.6.0:
     underscore "^1.9.1"
     yargs "^15.4.1"
 
+whoiser@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.npmjs.org/whoiser/-/whoiser-1.13.1.tgz#943a2030199efd774d5047df22528316ac6de5de"
+  integrity sha512-4MF0LoIsSdM7R9rs9A+PxbCXMDRmRdF7eZb8IC8pGethCrSizqMLcbJCXZO5iZGqOKovQlRhpSFGGUlwUPzoQA==
+  dependencies:
+    punycode "^2.1.1"
+
 wide-align@^1.1.0:
   version "1.1.5"
   resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"