diff --git a/packages/cli/src/commands/repo/fix.ts b/packages/cli/src/commands/repo/fix.ts
index 4e7aefdaa7..a55440c53f 100644
--- a/packages/cli/src/commands/repo/fix.ts
+++ b/packages/cli/src/commands/repo/fix.ts
@@ -363,7 +363,8 @@ export function fixPluginPackages(
     if (
       role === 'common-library' ||
       role === 'web-library' ||
-      role === 'node-library'
+      role === 'node-library' ||
+      role === 'frontend-plugin-module' // TODO(Rugvip): Remove this once frontend modules are required to have a plugin ID
     ) {
       return;
     }
diff --git a/packages/cli/src/lib/publishing.ts b/packages/cli/src/lib/publishing.ts
index 20e4241985..c213355478 100644
--- a/packages/cli/src/lib/publishing.ts
+++ b/packages/cli/src/lib/publishing.ts
@@ -30,8 +30,9 @@ export function publishPreflightCheck(pkg: BackstagePackage): void {
   if (
     role === 'backend-plugin' ||
     role === 'backend-plugin-module' ||
-    role === 'frontend-plugin' ||
-    role === 'frontend-plugin-module'
+    role === 'frontend-plugin'
+    // TODO(Rugvip): We currently support plugin-less frontend modules for the new frontend system, but it needs a different solution
+    // || role === 'frontend-plugin-module'
   ) {
     if (!backstage.pluginId) {
       throw new Error(
@@ -62,7 +63,8 @@ export function publishPreflightCheck(pkg: BackstagePackage): void {
   }
 
   if (role === 'backend-plugin-module' || role === 'frontend-plugin-module') {
-    if (!backstage.pluginPackage) {
+    // TODO(Rugvip): Remove this .pluginId check once frontend modules are required to have a plugin ID
+    if (backstage.pluginId && !backstage.pluginPackage) {
       throw new Error(
         `Plugin module package ${name} is missing a backstage.pluginPackage, please run 'backstage-cli repo fix --publish'`,
       );