diff --git a/src/app/api/eterra/export-bundle/route.ts b/src/app/api/eterra/export-bundle/route.ts
index bd53658..ff4962c 100644
--- a/src/app/api/eterra/export-bundle/route.ts
+++ b/src/app/api/eterra/export-bundle/route.ts
@@ -272,6 +272,7 @@ export async function POST(req: Request) {
             phase = ph;
             updatePhaseProgress(done, tot);
           },
+          // workspacePk will be auto-resolved from DB/ArcGIS inside the service
         },
       );
 
diff --git a/src/app/api/eterra/no-geom-scan/route.ts b/src/app/api/eterra/no-geom-scan/route.ts
index 9365c63..36b77e3 100644
--- a/src/app/api/eterra/no-geom-scan/route.ts
+++ b/src/app/api/eterra/no-geom-scan/route.ts
@@ -21,7 +21,10 @@ export const dynamic = "force-dynamic";
 
 export async function POST(req: Request) {
   try {
-    const body = (await req.json()) as { siruta?: string };
+    const body = (await req.json()) as {
+      siruta?: string;
+      workspacePk?: number;
+    };
     const siruta = String(body.siruta ?? "").trim();
     if (!/^\d+$/.test(siruta)) {
       return NextResponse.json(
@@ -45,7 +48,9 @@ export async function POST(req: Request) {
     }
 
     const client = await EterraClient.create(username, password);
-    const result = await scanNoGeometryParcels(client, siruta);
+    const result = await scanNoGeometryParcels(client, siruta, {
+      workspacePk: body.workspacePk ?? null,
+    });
 
     return NextResponse.json(result);
   } catch (error) {
diff --git a/src/modules/parcel-sync/components/parcel-sync-module.tsx b/src/modules/parcel-sync/components/parcel-sync-module.tsx
index fa9f504..d57bcb3 100644
--- a/src/modules/parcel-sync/components/parcel-sync-module.tsx
+++ b/src/modules/parcel-sync/components/parcel-sync-module.tsx
@@ -690,7 +690,10 @@ export function ParcelSyncModule() {
         const res = await fetch("/api/eterra/no-geom-scan", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ siruta: s }),
+          body: JSON.stringify({
+            siruta: s,
+            workspacePk: workspacePk ?? undefined,
+          }),
         });
         const data = (await res.json()) as {
           totalImmovables?: number;
@@ -699,7 +702,7 @@ export function ParcelSyncModule() {
           error?: string;
         };
         if (data.error) {
-          // Show zero result instead of hiding the card entirely
+          console.warn("[no-geom-scan]", data.error);
           setNoGeomScan({ totalImmovables: 0, totalInDb: 0, noGeomCount: 0 });
         } else {
           setNoGeomScan({
@@ -714,7 +717,7 @@ export function ParcelSyncModule() {
       }
       setNoGeomScanning(false);
     },
-    [siruta],
+    [siruta, workspacePk],
   );
 
   // Auto-scan for no-geometry parcels when UAT is selected + connected
@@ -2376,7 +2379,7 @@ export function ParcelSyncModule() {
                   <CardContent className="py-3 px-4">
                     <div className="flex items-center gap-2 text-sm text-muted-foreground">
                       <Loader2 className="h-4 w-4 animate-spin text-amber-500" />
-                      Se verifică parcele fără geometrie în eTerra…
+                      Se scanează lista de imobile din eTerra…
                     </div>
                   </CardContent>
                 </Card>
@@ -2398,19 +2401,23 @@ export function ParcelSyncModule() {
                       <AlertTriangle className="h-4 w-4 text-amber-500 shrink-0" />
                       <div className="flex-1 min-w-0">
                         <p className="text-sm">
+                          Din{" "}
+                          <span className="font-semibold">
+                            {noGeomScan.totalImmovables.toLocaleString("ro-RO")}
+                          </span>{" "}
+                          imobile în eTerra:{" "}
+                          <span className="text-emerald-600 dark:text-emerald-400 font-medium">
+                            {noGeomScan.totalInDb.toLocaleString("ro-RO")}
+                          </span>{" "}
+                          cu geometrie,{" "}
                           <span className="font-semibold text-amber-600 dark:text-amber-400">
                             {noGeomScan.noGeomCount.toLocaleString("ro-RO")}
                           </span>{" "}
-                          parcele există în eTerra dar{" "}
-                          <span className="font-medium">nu au geometrie</span>{" "}
-                          în layerul GIS
+                          <span className="font-medium">fără geometrie</span>
                         </p>
                         <p className="text-[11px] text-muted-foreground mt-0.5">
-                          Din{" "}
-                          {noGeomScan.totalImmovables.toLocaleString("ro-RO")}{" "}
-                          imobile total în eTerra,{" "}
-                          {noGeomScan.totalInDb.toLocaleString("ro-RO")} sunt
-                          deja în baza de date cu geometrie.
+                          Cele fără geometrie există în baza de date eTerra dar
+                          nu au contur desenat în layerul GIS.
                         </p>
                       </div>
                       <Button
@@ -2446,17 +2453,27 @@ export function ParcelSyncModule() {
                 </Card>
               );
 
-            // Scan done, all parcels have geometry
+            // Scan done, all parcels have geometry (or totalImmovables=0 ⇒ workspace issue)
             if (scanDone && !hasNoGeomParcels)
               return (
                 <Card className="border-dashed">
                   <CardContent className="py-2.5 px-4">
                     <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                      <CheckCircle2 className="h-3.5 w-3.5 text-emerald-500" />
-                      Toate cele{" "}
-                      {noGeomScan.totalImmovables.toLocaleString("ro-RO")}{" "}
-                      parcele din eTerra au geometrie — nimic de importat
-                      suplimentar.
+                      {noGeomScan.totalImmovables > 0 ? (
+                        <>
+                          <CheckCircle2 className="h-3.5 w-3.5 text-emerald-500" />
+                          Toate cele{" "}
+                          {noGeomScan.totalImmovables.toLocaleString("ro-RO")}{" "}
+                          imobile din eTerra au geometrie — nimic de importat
+                          suplimentar.
+                        </>
+                      ) : (
+                        <>
+                          <AlertTriangle className="h-3.5 w-3.5 text-muted-foreground" />
+                          Nu s-au găsit imobile în lista eTerra pentru acest
+                          UAT. Verifică sesiunea eTerra.
+                        </>
+                      )}
                     </div>
                   </CardContent>
                 </Card>
diff --git a/src/modules/parcel-sync/services/no-geom-sync.ts b/src/modules/parcel-sync/services/no-geom-sync.ts
index 539995a..12d315f 100644
--- a/src/modules/parcel-sync/services/no-geom-sync.ts
+++ b/src/modules/parcel-sync/services/no-geom-sync.ts
@@ -22,6 +22,65 @@ import { EterraClient } from "./eterra-client";
 
 const prisma = new PrismaClient();
 
+/* ------------------------------------------------------------------ */
+/*  Workspace resolution (county → eTerra workspace PK)                */
+/* ------------------------------------------------------------------ */
+
+/**
+ * Resolve the eTerra workspace PK for a SIRUTA.
+ * Chain: explicit param → GisUat DB row → ArcGIS layer query → null.
+ */
+async function resolveWorkspacePk(
+  client: EterraClient,
+  siruta: string,
+  explicitPk?: number | null,
+): Promise<number | null> {
+  // 1. Explicit param
+  if (explicitPk && Number.isFinite(explicitPk) && explicitPk > 0) {
+    return explicitPk;
+  }
+
+  // 2. DB lookup
+  try {
+    const row = await prisma.gisUat.findUnique({
+      where: { siruta },
+      select: { workspacePk: true },
+    });
+    if (row?.workspacePk && row.workspacePk > 0) return row.workspacePk;
+  } catch {
+    /* ignore */
+  }
+
+  // 3. ArcGIS layer query — fetch 1 feature from TERENURI_ACTIVE for this siruta
+  try {
+    const features = await client.listLayer(
+      {
+        id: "TERENURI_ACTIVE",
+        name: "TERENURI_ACTIVE",
+        endpoint: "aut",
+        whereTemplate: "{{adminField}}={{siruta}} AND IS_ACTIVE=1",
+      },
+      siruta,
+      { limit: 1, outFields: "WORKSPACE_ID" },
+    );
+    const wsId = features?.[0]?.attributes?.WORKSPACE_ID;
+    if (wsId != null) {
+      const num = Number(wsId);
+      if (Number.isFinite(num) && num > 0) {
+        // Persist for future lookups
+        prisma.gisUat
+          .update({ where: { siruta }, data: { workspacePk: num } })
+          .catch(() => {});
+        return num;
+      }
+    }
+  } catch {
+    /* ignore */
+  }
+
+  return null;
+}
+
 const normalizeId = (value: unknown) => {
   if (value === null || value === undefined) return "";
   const text = String(value).trim();
@@ -43,6 +102,8 @@ export type NoGeomScanResult = {
     paperCadNo?: string;
     paperCfNo?: string;
   }>;
+  /** Error message if workspace couldn't be resolved */
+  error?: string;
 };
 
 export type NoGeomSyncResult = {
@@ -64,12 +125,26 @@ export async function scanNoGeometryParcels(
   siruta: string,
   options?: {
     onProgress?: (page: number, totalPages: number) => void;
+    workspacePk?: number | null;
   },
 ): Promise<NoGeomScanResult> {
+  // 0. Resolve workspace
+  const wsPk = await resolveWorkspacePk(client, siruta, options?.workspacePk);
+  if (!wsPk) {
+    return {
+      totalImmovables: 0,
+      totalInDb: 0,
+      noGeomCount: 0,
+      samples: [],
+      error: `Nu s-a putut determina workspace-ul (județul) pentru SIRUTA ${siruta}`,
+    };
+  }
+
   // 1. Fetch all immovables from eTerra
   const allImmovables = await fetchAllImmovables(
     client,
     siruta,
+    wsPk,
     options?.onProgress,
   );
 
@@ -131,12 +206,25 @@ export async function syncNoGeometryParcels(
   siruta: string,
   options?: {
     onProgress?: (done: number, total: number, phase: string) => void;
+    workspacePk?: number | null;
   },
 ): Promise<NoGeomSyncResult> {
   try {
+    // 0. Resolve workspace
+    const wsPk = await resolveWorkspacePk(client, siruta, options?.workspacePk);
+    if (!wsPk) {
+      return {
+        imported: 0,
+        skipped: 0,
+        errors: 0,
+        status: "error",
+        error: `Nu s-a putut determina workspace-ul pentru SIRUTA ${siruta}`,
+      };
+    }
+
     // 1. Fetch all immovables
     options?.onProgress?.(0, 1, "Descărcare listă imobile (fără geometrie)");
-    const allImmovables = await fetchAllImmovables(client, siruta);
+    const allImmovables = await fetchAllImmovables(client, siruta, wsPk);
 
     // 2. Get existing features from DB
     const existingFeatures = await prisma.gisFeature.findMany({
@@ -251,6 +339,7 @@ export async function syncNoGeometryParcels(
 async function fetchAllImmovables(
   client: EterraClient,
   siruta: string,
+  workspaceId: number,
   onProgress?: (page: number, totalPages: number) => void,
 ): Promise<any[]> {
   const all: any[] = [];
@@ -258,10 +347,6 @@ async function fetchAllImmovables(
   let totalPages = 1;
   let includeInscrisCF = true;
 
-  // The workspace ID for eTerra admin unit queries.
-  // Default to 65 (standard workspace); the eTerra API resolves by adminUnit.
-  const workspaceId = 65;
-
   while (page < totalPages) {
     const response = await client.fetchImmovableListByAdminUnit(
       workspaceId,