diff --git a/libs/badge-list.ts b/libs/badge-list.ts
index 0d53d83..89cb58b 100644
--- a/libs/badge-list.ts
+++ b/libs/badge-list.ts
@@ -29,7 +29,6 @@ export const liveBadgeList = [
   'wapm',
   'snapcraft',
   // CI
-  'circleci',
   'appveyor',
   'codacy',
   'azure-pipelines',
diff --git a/libs/badge-list2.ts b/libs/badge-list2.ts
index 00c2b81..d69f3c4 100644
--- a/libs/badge-list2.ts
+++ b/libs/badge-list2.ts
@@ -14,6 +14,7 @@ import codeclimate from '../pages/api/codeclimate'
 import codecov from '../pages/api/codecov'
 import coveralls from '../pages/api/coveralls'
 import travis from '../pages/api/travis'
+import circleci from '../pages/api/circleci'
 import chromeWebStore from '../pages/api/chrome-web-store'
 import vsMarketplace from '../pages/api/vs-marketplace'
 import openVsx from '../pages/api/open-vsx'
@@ -49,6 +50,7 @@ export default {
   codecov: codecov.meta,
   coveralls: coveralls.meta,
   travis: travis.meta,
+  circleci: circleci.meta,
   peertube: peertube.meta,
   discord: discord.meta,
   matrix: matrix.meta,
diff --git a/next.config.js b/next.config.js
index 336932e..e8b6cfc 100644
--- a/next.config.js
+++ b/next.config.js
@@ -50,6 +50,7 @@ const nextConfig = {
       '/codecov',
       '/coveralls',
       '/travis',
+      '/circleci',
       '/xo',
       // social network
       '/discord',
diff --git a/api-/circleci.ts b/pages/api/circleci.ts
similarity index 69%
rename from api-/circleci.ts
rename to pages/api/circleci.ts
index 7976694..ce06beb 100644
--- a/api-/circleci.ts
+++ b/pages/api/circleci.ts
@@ -1,5 +1,5 @@
-import got from '../libs/got'
-import { createBadgenHandler, PathArgs } from '../libs/create-badgen-handler'
+import got from '../../libs/got'
+import { createBadgenHandler, PathArgs } from '../../libs/create-badgen-handler-next'
 
 const CIRCLECI_API_URL = 'https://circleci.com/api/v1.1/'
 
@@ -8,8 +8,8 @@ const client = got.extend({ prefixUrl: CIRCLECI_API_URL })
 export default createBadgenHandler({
   title: 'CircleCI',
   examples: {
-    '/circleci/github/nuxt/nuxt.js': 'build',
-    '/circleci/github/nuxt/nuxt.js/master': 'build (branch)',
+    '/circleci/github/circleci/circleci-docs': 'build',
+    '/circleci/github/circleci/circleci-docs/master': 'build (branch)',
   },
   handlers: {
     '/circleci/:vcs<github|gitlab>/:owner/:repo/:branch?': handler
@@ -23,6 +23,15 @@ async function handler ({ vcs, owner, repo, branch }: PathArgs) {
   const searchParams = { filter: 'completed', limit: 1, shallow: true }
   const [latest] = await client.get(path, { searchParams }).json<any>()
 
+
+  if (latest === undefined) {
+    return {
+      subject: 'circleci',
+      status: 'not found',
+      color: 'grey'
+    }
+  }
+
   const color = {
     failed: 'red',
     success: 'green'
diff --git a/vercel.json b/vercel.json
index 5631cc9..ad4e2f0 100644
--- a/vercel.json
+++ b/vercel.json
@@ -16,10 +16,6 @@
       "source": "/badgesize/:match*",
       "destination": "https://v2022.badgen.net/badgesize/:match*"
     },
-    {
-      "source": "/circleci/:match*",
-      "destination": "https://v2022.badgen.net/circleci/:match*"
-    },
     {
       "source": "/cocoapods/:match*",
       "destination": "https://v2022.badgen.net/cocoapods/:match*"