diff --git a/.changeset/breezy-waves-camp.md b/.changeset/breezy-waves-camp.md
new file mode 100644
index 0000000000..13dee6baa7
--- /dev/null
+++ b/.changeset/breezy-waves-camp.md
@@ -0,0 +1,5 @@
+---
+"dependency-path": patch
+---
+
+Fix `tryGetPackageId()`, it should parse correctly a dependency path that has peer dependency names with underscores.
diff --git a/packages/dependency-path/src/index.ts b/packages/dependency-path/src/index.ts
index 892f6604c4..6348d6c6c8 100644
--- a/packages/dependency-path/src/index.ts
+++ b/packages/dependency-path/src/index.ts
@@ -31,9 +31,9 @@ export function tryGetPackageId (registries: Registries, relDepPath: string) {
   if (relDepPath[0] !== '/') {
     return null
   }
-  const lastUnderscore = relDepPath.lastIndexOf('_')
-  if (lastUnderscore > relDepPath.lastIndexOf('/')) {
-    return resolve(registries, relDepPath.substr(0, lastUnderscore))
+  const underscoreIndex = relDepPath.indexOf('_', relDepPath.lastIndexOf('/'))
+  if (underscoreIndex !== -1) {
+    return resolve(registries, relDepPath.substr(0, underscoreIndex))
   }
   return resolve(registries, relDepPath)
 }
diff --git a/packages/dependency-path/test/index.ts b/packages/dependency-path/test/index.ts
index d5b9e975f4..7975693701 100644
--- a/packages/dependency-path/test/index.ts
+++ b/packages/dependency-path/test/index.ts
@@ -7,6 +7,7 @@ import {
   refToRelative,
   relative,
   resolve,
+  tryGetPackageId,
 } from 'dependency-path'
 
 test('isAbsolute()', () => {
@@ -73,6 +74,14 @@ test('parse()', () => {
     version: '1.0.0',
   })
 
+  expect(parse('/foo/1.0.0_@types+babel__core@7.1.14')).toStrictEqual({
+    host: undefined,
+    isAbsolute: false,
+    name: 'foo',
+    peersSuffix: '@types+babel__core@7.1.14',
+    version: '1.0.0',
+  })
+
   expect(() => parse('/foo/bar')).toThrow(/\/foo\/bar is an invalid relative dependency path/)
 })
 
@@ -130,3 +139,7 @@ test('depPathToFilename()', () => {
   expect(depPathToFilename('abcd/'.repeat(200), process.cwd())).toBe('abcd+abcd+abcd+abcd+abcd+abcd+abcd+abcd+abcd+abcd+_27524303f1ddd808db67f175ff83606e')
   expect(depPathToFilename('/JSONSteam/1.0.0', process.cwd())).toBe('JSONSteam@1.0.0_4b2567ab922fbdf01171f59fab8f6fef')
 })
+
+test('tryGetPackageId', () => {
+  expect(tryGetPackageId({ default: 'https://registry.npmjs.org/' }, '/foo/1.0.0_@types+babel__core@7.1.14')).toEqual('registry.npmjs.org/foo/1.0.0')
+})