diff --git a/src/auth/remote-sms-auth.guard.ts b/src/auth/remote-sms-auth.guard.ts
index fe5454b..900ab74 100644
--- a/src/auth/remote-sms-auth.guard.ts
+++ b/src/auth/remote-sms-auth.guard.ts
@@ -135,6 +135,9 @@ export class RemoteSmsAuthGuard implements CanActivate {
         nameFa: true,
         domain: true,
         domains: true,
+        adminUrl: true,
+        appUrl: true,
+        nodeServer: true,
         product: true,
         isActive: true,
       },
@@ -152,15 +155,31 @@ export class RemoteSmsAuthGuard implements CanActivate {
   }
 
   private matchesHost(
-    tenant: { domain: string | null; domains: unknown },
+    tenant: {
+      domain: string | null;
+      domains: unknown;
+      adminUrl?: string | null;
+      appUrl?: string | null;
+      nodeServer?: string | null;
+    },
     host: string,
   ) {
-    const candidates = new Set<string>();
-    for (const value of [tenant.domain, ...this.readDomains(tenant.domains)]) {
+    const hostNoWww = host.replace(/^www\./, '');
+    const values = [
+      tenant.domain,
+      tenant.adminUrl,
+      tenant.appUrl,
+      tenant.nodeServer,
+      ...this.readDomains(tenant.domains),
+    ];
+    for (const value of values) {
       const normalized = this.normalizeHost(value);
-      if (normalized) candidates.add(normalized);
+      if (!normalized) continue;
+      if (normalized === host || normalized.replace(/^www\./, '') === hostNoWww) {
+        return true;
+      }
     }
-    return candidates.has(host);
+    return false;
   }
 
   private readDomains(raw: unknown): string[] {
diff --git a/src/plugins/plugin-store.service.ts b/src/plugins/plugin-store.service.ts
index 1adf442..cd01d04 100644
--- a/src/plugins/plugin-store.service.ts
+++ b/src/plugins/plugin-store.service.ts
@@ -470,6 +470,16 @@ export class PluginStoreService implements OnModuleInit, OnModuleDestroy {
 
   async remoteStore(tenantId: string, product: string) {
     await this.assertRemoteKhanegi(tenantId, product);
+    try {
+      return await this.buildRemoteStore(tenantId);
+    } catch (error: any) {
+      if (error instanceof ForbiddenException) throw error;
+      this.logger.warn(`remoteStore skipped: ${error?.message || error}`);
+      return { plugin_store_enabled: true, items: [] };
+    }
+  }
+
+  private async buildRemoteStore(tenantId: string) {
     const items = await this.prisma.pluginCatalogItem.findMany({
       where: { inStore: true },
       orderBy: { titleFa: 'asc' },
@@ -531,6 +541,16 @@ export class PluginStoreService implements OnModuleInit, OnModuleDestroy {
 
   async remoteListRequests(tenantId: string, product: string) {
     await this.assertRemoteKhanegi(tenantId, product);
+    try {
+      return await this.buildRemoteRequestRows(tenantId);
+    } catch (error: any) {
+      if (error instanceof ForbiddenException) throw error;
+      this.logger.warn(`remoteListRequests skipped: ${error?.message || error}`);
+      return [];
+    }
+  }
+
+  private async buildRemoteRequestRows(tenantId: string) {
     const rows = await this.prisma.pluginPurchaseRequest.findMany({
       where: { tenantId },
       orderBy: { createdAt: 'desc' },