diff --git a/.yarn/versions/a4f6973d.yml b/.yarn/versions/a4f6973d.yml
new file mode 100644
index 000000000000..7d9ee99c110c
--- /dev/null
+++ b/.yarn/versions/a4f6973d.yml
@@ -0,0 +1,2 @@
+releases:
+  "@yarnpkg/doctor": patch
diff --git a/packages/yarnpkg-doctor/sources/cli.ts b/packages/yarnpkg-doctor/sources/cli.ts
index 9dfe104448a1..db403b0b41e5 100644
--- a/packages/yarnpkg-doctor/sources/cli.ts
+++ b/packages/yarnpkg-doctor/sources/cli.ts
@@ -6,17 +6,11 @@ import {PortablePath, npath, ppath, xfs}
 import {Cli, Command, Builtins, Option}                                                                                                                                                     from 'clipanion';
 import globby                                                                                                                                                                               from 'globby';
 import micromatch                                                                                                                                                                           from 'micromatch';
-import {Module}                                                                                                                                                                             from 'module';
+import {isBuiltin}                                                                                                                                                                          from 'module';
 import * as ts                                                                                                                                                                              from 'typescript';
 
 import * as ast                                                                                                                                                                             from './ast';
 
-const BUILTINS = new Set([
-  ...(Module.builtinModules || []),
-  ...(Module.builtinModules || []).map(mod => `node:${mod}`),
-  `pnpapi`,
-]);
-
 function probablyMinified(content: string) {
   if (content.length > 1024 * 1024)
     return true;
@@ -84,7 +78,7 @@ function isValidDependency(ident: Ident, {workspace}: {workspace: Workspace}) {
 }
 
 function checkForUndeclaredDependency(workspace: Workspace, referenceNode: ts.Node, moduleName: string, {configuration, report}: {configuration: Configuration, report: Report}) {
-  if (BUILTINS.has(moduleName))
+  if (isBuiltin(moduleName) || moduleName === `pnpapi`)
     return;
 
   const idents = extractIdents(moduleName);