diff --git a/packages/pnpm/src/main.ts b/packages/pnpm/src/main.ts
index 6ac4df790f9..428125abffe 100644
--- a/packages/pnpm/src/main.ts
+++ b/packages/pnpm/src/main.ts
@@ -196,9 +196,9 @@ export default async function run (inputArgv: string[]) {
     ]
     const relativeWSDirPath = () => path.relative(process.cwd(), wsDir) || '.'
     if (config.workspaceRoot) {
-      filters.push({ filter: `{${relativeWSDirPath()}}`, followProdDepsOnly: false })
+      filters.push({ filter: `{${relativeWSDirPath()}}`, followProdDepsOnly: Boolean(config.filterProd.length) })
     } else if (!config.includeWorkspaceRoot && (cmd === 'run' || cmd === 'exec' || cmd === 'add' || cmd === 'test')) {
-      filters.push({ filter: `!{${relativeWSDirPath()}}`, followProdDepsOnly: false })
+      filters.push({ filter: `!{${relativeWSDirPath()}}`, followProdDepsOnly: Boolean(config.filterProd.length) })
     }
 
     const filterResults = await filterPackages(allProjects, filters, {