diff --git a/src/app/components/farmacia/farmacia-create-update.component.ts b/src/app/components/farmacia/farmacia-create-update.component.ts
index 2960382a92..da386a07be 100644
--- a/src/app/components/farmacia/farmacia-create-update.component.ts
+++ b/src/app/components/farmacia/farmacia-create-update.component.ts
@@ -87,6 +87,9 @@ export class FarmaciaCreateUpdateComponent implements OnInit {
     ngOnInit() {
         if (this.farmaciaSeleccionada) {
             this.farmacia = this.farmaciaSeleccionada;
+            if (this.farmacia.cuit && this.farmacia.cuit.length === 11 && !this.farmacia.cuit.includes('-')) {
+                this.farmacia.cuit = this.farmacia.cuit.slice(0, 2) + '-' + this.farmacia.cuit.slice(2, 10) + '-' + this.farmacia.cuit.slice(10);
+            }
             this.asociado = { id: this.farmaciaSeleccionada.asociadoA, nombre: this.farmaciaSeleccionada.asociadoA };
         }
         this.provincias$ = this.provinciaService.get({}).pipe(
@@ -103,6 +106,7 @@ export class FarmaciaCreateUpdateComponent implements OnInit {
 
     save() {
         this.farmacia.asociadoA = this.asociado.nombre;
+        this.farmacia.cuit = this.farmacia.cuit ? this.farmacia.cuit.replace(/\D/g, '') : '';
         // si estamos editado una farmacia.
         if (this.farmaciaSeleccionada) {
             const farmaciaUpdate = Object.assign({}, this.farmacia);
diff --git a/src/app/components/farmacia/farmacia.component.html b/src/app/components/farmacia/farmacia.component.html
index d3a8358dc3..005dcd7207 100644
--- a/src/app/components/farmacia/farmacia.component.html
+++ b/src/app/components/farmacia/farmacia.component.html
@@ -41,7 +41,7 @@
                     [class.selectable]="true">
                     <td *plTableCol="'denominacion'">{{farmacia.denominacion}}</td>
                     <td *plTableCol="'razonSocial'">{{farmacia.razonSocial}}</td>
-                    <td *plTableCol="'cuit'">{{farmacia.cuit}}</td>
+                    <td *plTableCol="'cuit'">{{formatCuitDisplay(farmacia.cuit)}}</td>
                     <td *plTableCol="'DTResponsable'">{{farmacia.DTResponsable}}</td>
                     <td *plTableCol="'matriculaDTR'">{{farmacia.matriculaDTResponsable}}</td>
                     <td *plTableCol="'disposicionAltaDT'">{{farmacia.disposicionAltaDT}}</td>
@@ -71,7 +71,7 @@
             <plex-detail [direction]="'column'" [justify]="'start'">
                 <plex-icon size="md" name="farmacia" type="info"></plex-icon>
                 <div title case="capitalize" title>{{farmaciaSelected.denominacion }}</div>
-                <div subtitle>{{ farmaciaSelected?.cuit}} </div>
+                <div subtitle>{{ formatCuitDisplay(farmaciaSelected?.cuit) }} </div>
                 <plex-label *ngIf="farmaciaSelected.razonSocial" titulo="Razón Social"
                             subtitulo="{{ farmaciaSelected.razonSocial}}">
                 </plex-label>
diff --git a/src/app/components/farmacia/farmacia.component.ts b/src/app/components/farmacia/farmacia.component.ts
index af41c46954..54b2b922da 100644
--- a/src/app/components/farmacia/farmacia.component.ts
+++ b/src/app/components/farmacia/farmacia.component.ts
@@ -152,7 +152,7 @@ export class FarmaciaComponent implements OnInit {
         this.farmaciaService.lastResults.next(null);
         this.farmaciaService.denominacion.next(this.filtros.denominacion);
         this.farmaciaService.razonSocial.next(this.filtros.razonSocial);
-        this.farmaciaService.cuit.next(this.filtros.cuit);
+        this.farmaciaService.cuit.next(this.filtros.cuit ? this.filtros.cuit.replace(/\D/g, '') : null);
         this.farmaciaService.DTResponsable.next(this.filtros.DTResponsable);
         this.farmaciaService.asociado.next(this.filtros.asociado);
     }
@@ -318,4 +318,11 @@ export class FarmaciaComponent implements OnInit {
 
         this.filtros.cuit = cuit;
     }
+
+    formatCuitDisplay(raw: string): string {
+        if (!raw) { return ''; }
+        const digits = raw.replace(/\D/g, '');
+        if (digits.length < 11) { return raw; }
+        return digits.slice(0, 2) + '-' + digits.slice(2, 10) + '-' + digits.slice(10);
+    }
 }