diff --git a/src/backend/services/core.service.ts b/src/backend/services/core.service.ts
index a92461a..a312492 100644
--- a/src/backend/services/core.service.ts
+++ b/src/backend/services/core.service.ts
@@ -75,7 +75,8 @@ export class CoreService {
       try {
         const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
         if (process.env.PUBLIC_URL) {
-          manifest.remoteEntry = `${process.env.PUBLIC_URL}/remoteEntry.js`;
+          const p = manifest.remoteEntry ? new URL(manifest.remoteEntry).pathname : '/remoteEntry.js';
+          manifest.remoteEntry = `${process.env.PUBLIC_URL}${p}`;
         }
         manifest.backendUrl = backendUrl;