diff --git a/packages/generators/generators/lib/files/plugin/admin/src/pluginId.js b/packages/generators/generators/lib/files/plugin/admin/src/pluginId.js
index f604a009da..3c66397d54 100644
--- a/packages/generators/generators/lib/files/plugin/admin/src/pluginId.js
+++ b/packages/generators/generators/lib/files/plugin/admin/src/pluginId.js
@@ -1,5 +1,5 @@
 const pluginPkg = require('../../package.json');
 
-const pluginId = pluginPkg.name.replace(/^@strapi\/plugin-/i, '');
+const pluginId = pluginPkg.name.replace(/^(@[^-,.][\w,-]+\/|strapi-)plugin-/i, '');
 
 module.exports = pluginId;