diff --git a/src/modules/parcel-sync/components/parcel-sync-module.tsx b/src/modules/parcel-sync/components/parcel-sync-module.tsx
index 3ce69a5..1b8623d 100644
--- a/src/modules/parcel-sync/components/parcel-sync-module.tsx
+++ b/src/modules/parcel-sync/components/parcel-sync-module.tsx
@@ -24,6 +24,7 @@ import {
   HardDrive,
   Clock,
   ArrowDownToLine,
+  AlertTriangle,
 } from "lucide-react";
 import { Button } from "@/shared/components/ui/button";
 import { Input } from "@/shared/components/ui/input";
@@ -710,6 +711,15 @@ export function ParcelSyncModule() {
     setNoGeomScanning(false);
   }, [siruta, noGeomScanning]);
 
+  // Auto-scan for no-geometry parcels when UAT is selected + connected
+  useEffect(() => {
+    if (!siruta || !session.connected || noGeomScanning) return;
+    // Don't re-scan if we already scanned this siruta
+    if (noGeomScanSiruta === siruta && noGeomScan !== null) return;
+    void handleNoGeomScan();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [siruta, session.connected]);
+
   /* ════════════════════════════════════════════════════════════ */
   /*  Layer feature counts                                         */
   /* ════════════════════════════════════════════════════════════ */
@@ -2344,70 +2354,109 @@ export function ParcelSyncModule() {
           </Card>
         )}
 
-        {/* No-geometry option */}
-        {sirutaValid && session.connected && (
-          <Card className="border-dashed">
-            <CardContent className="py-3 px-4">
-              <div className="flex items-center gap-3 flex-wrap">
-                <label className="flex items-center gap-2 cursor-pointer select-none">
-                  <input
-                    type="checkbox"
-                    checked={includeNoGeom}
-                    onChange={(e) => setIncludeNoGeom(e.target.checked)}
-                    disabled={exporting}
-                    className="h-4 w-4 rounded border-muted-foreground/30 accent-amber-600"
-                  />
-                  <span className="text-sm">
-                    Include parcele{" "}
-                    <span className="font-medium">fără geometrie</span>
-                  </span>
-                </label>
-                <Button
-                  variant="outline"
-                  size="sm"
-                  className="h-7 text-xs"
-                  disabled={noGeomScanning || exporting}
-                  onClick={() => void handleNoGeomScan()}
-                >
-                  {noGeomScanning ? (
-                    <Loader2 className="h-3 w-3 mr-1 animate-spin" />
-                  ) : (
-                    <Search className="h-3 w-3 mr-1" />
+        {/* No-geometry option — shown after auto-scan completes */}
+        {sirutaValid &&
+          session.connected &&
+          (() => {
+            const scanDone = noGeomScan !== null && noGeomScanSiruta === siruta;
+            const hasNoGeomParcels = scanDone && noGeomScan.noGeomCount > 0;
+            const scanning = noGeomScanning;
+
+            // Still scanning
+            if (scanning)
+              return (
+                <Card className="border-amber-200/50 dark:border-amber-800/50">
+                  <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…
+                    </div>
+                  </CardContent>
+                </Card>
+              );
+
+            // No-geometry parcels found
+            if (hasNoGeomParcels)
+              return (
+                <Card
+                  className={cn(
+                    "transition-colors",
+                    includeNoGeom
+                      ? "border-amber-400 bg-amber-50/50 dark:border-amber-700 dark:bg-amber-950/20"
+                      : "border-amber-200 dark:border-amber-800/50",
                   )}
-                  Scanare
-                </Button>
-                {noGeomScan && noGeomScanSiruta === siruta && (
-                  <span className="text-xs text-muted-foreground">
-                    {noGeomScan.noGeomCount > 0 ? (
-                      <>
-                        <span className="font-semibold text-amber-600 dark:text-amber-400">
-                          {noGeomScan.noGeomCount.toLocaleString("ro-RO")}
-                        </span>{" "}
-                        parcele fără geometrie
-                        <span className="ml-1 opacity-60">
-                          (din{" "}
+                >
+                  <CardContent className="py-3 px-4 space-y-2">
+                    <div className="flex items-center gap-3">
+                      <AlertTriangle className="h-4 w-4 text-amber-500 shrink-0" />
+                      <div className="flex-1 min-w-0">
+                        <p className="text-sm">
+                          <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
+                        </p>
+                        <p className="text-[11px] text-muted-foreground mt-0.5">
+                          Din{" "}
                           {noGeomScan.totalImmovables.toLocaleString("ro-RO")}{" "}
-                          total eTerra,{" "}
-                          {noGeomScan.totalInDb.toLocaleString("ro-RO")} în DB)
-                        </span>
-                      </>
-                    ) : (
-                      <span className="text-emerald-600 dark:text-emerald-400">
-                        Toate parcelele au geometrie
+                          imobile total în eTerra,{" "}
+                          {noGeomScan.totalInDb.toLocaleString("ro-RO")} sunt
+                          deja în baza de date cu geometrie.
+                        </p>
+                      </div>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        className="h-7 text-xs shrink-0"
+                        disabled={noGeomScanning || exporting}
+                        onClick={() => void handleNoGeomScan()}
+                        title="Re-scanare"
+                      >
+                        <RefreshCw className="h-3 w-3" />
+                      </Button>
+                    </div>
+                    <label className="flex items-center gap-2 cursor-pointer select-none ml-7">
+                      <input
+                        type="checkbox"
+                        checked={includeNoGeom}
+                        onChange={(e) => setIncludeNoGeom(e.target.checked)}
+                        disabled={exporting}
+                        className="h-4 w-4 rounded border-muted-foreground/30 accent-amber-600"
+                      />
+                      <span className="text-sm font-medium">
+                        Include și parcelele fără geometrie la export
                       </span>
+                    </label>
+                    {includeNoGeom && (
+                      <p className="text-[11px] text-muted-foreground ml-7">
+                        Vor fi importate în DB și incluse în CSV (coloana
+                        HAS_GEOMETRY=0). Nu apar în GPKG.
+                      </p>
                     )}
-                  </span>
-                )}
-              </div>
-              {includeNoGeom && (
-                <p className="text-[11px] text-muted-foreground mt-1.5 ml-6">
-                  Parcelele fără geometrie vor apărea doar în CSV (coloana
-                  HAS_GEOMETRY=0), nu în GPKG.
-                </p>
-              )}
-            </CardContent>
-          </Card>
-        )}
+                  </CardContent>
+                </Card>
+              );
+
+            // Scan done, all parcels have geometry
+            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.
+                    </div>
+                  </CardContent>
+                </Card>
+              );
+
+            return null;
+          })()}
 
         {/* Progress bar */}
         {exportProgress &&
diff --git a/temp-add-col.cjs b/temp-add-col.cjs
new file mode 100644
index 0000000..565d3e0
--- /dev/null
+++ b/temp-add-col.cjs
@@ -0,0 +1,19 @@
+const { PrismaClient } = require("@prisma/client");
+const p = new PrismaClient();
+const exec = p.$executeRawUnsafe.bind(p);
+const disconnect = p.$disconnect.bind(p);
+async function main() {
+  await exec(
+    'ALTER TABLE "GisFeature" ADD COLUMN IF NOT EXISTS "geometrySource" TEXT',
+  );
+  console.log("OK: geometrySource column added");
+  await exec(
+    'CREATE INDEX IF NOT EXISTS "GisFeature_geometrySource_idx" ON "GisFeature" ("geometrySource")',
+  );
+  console.log("OK: index created");
+  await disconnect();
+}
+main().catch((e) => {
+  console.log("ERR:", e.message);
+  disconnect();
+});
diff --git a/temp-add-col.js b/temp-add-col.js
new file mode 100644
index 0000000..07bfaa6
--- /dev/null
+++ b/temp-add-col.js
@@ -0,0 +1,10 @@
+const { PrismaClient } = require('@prisma/client');
+const p = new PrismaClient();
+async function main() {
+  await p['']('ALTER TABLE "GisFeature" ADD COLUMN IF NOT EXISTS "geometrySource" TEXT');
+  console.log('OK: geometrySource column added');
+  await p['']('CREATE INDEX IF NOT EXISTS "GisFeature_geometrySource_idx" ON "GisFeature" ("geometrySource")');
+  console.log('OK: index created');
+  await p['']();
+}
+main().catch(e => { console.log('ERR:', e.message); p[''](); });