diff --git a/src/js/controller.js b/src/js/controller.js
index 823420a..3bdcf8e 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -231,7 +231,7 @@ angular.module('focaModalDescarga')
                     $scope.hasErrorSucursalRemito = false;
                     return;
                 }
-    
+
                 focaModalDescargasService.validarSucursalRemito(sucursal, remito)
                     .then(function (res) {
                         if (res.data.data === 1) {
diff --git a/src/js/service.js b/src/js/service.js
index 009b2f6..b92d4e2 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -15,8 +15,10 @@ angular.module('focaModalDescarga')
                     for (var i = 0; i < articulosRemito.length; i++) {
 
                         var articuloReferencia = articulosBase.filter(function (articulo) {
-                            return articulosRemito[i].idArticulo == articulo.id;
+                            return articulosRemito[i].idArticulo == articulo.id &&
+                                parseInt(articulo.cantidad) > 0
                         })[0];
+                        if (articuloReferencia === undefined) continue;
 
                         delete articulosRemito[i].id
                         delete articulosRemito[i].editCantidad;
diff --git a/src/views/foca-modal-descarga.html b/src/views/foca-modal-descarga.html
index 3f50064..5897143 100644
--- a/src/views/foca-modal-descarga.html
+++ b/src/views/foca-modal-descarga.html
@@ -81,7 +81,14 @@
                                     cisterna.cisternaCarga.cantidad"
                                 ng-model="cisterna.cisternaCarga.descargar"
                                 ng-focus="$event.target.select();"
-                                class="text-center form-control col-12">
+                                class="text-center form-control col-12"
+                                ng-show="cisterna.cisternaCarga.cantidad > 0">
+                            <div
+                                class="text-center alert-danger p-1"
+                                role="alert"
+                                ng-hide="cisterna.cisternaCarga.cantidad > 0">
+                                Cisterna vacía.
+                            </div>
                         </td>
                     </tr>
                 </tbody>
@@ -109,7 +116,8 @@
         ladda="cargando"
         type="button"
         ng-click="crearRemito()"
-        ng-disabled="tieneArticulosPendientes() ||
-            idRemito === -1 || hasErrorSucursalRemito || !nroSucursal || !nroRemito"
-        foca-focus="!tieneArticulosPendientes() && idRemito !== -1">Descargar</button>
+        ng-disabled="idRemito === -1 || hasErrorSucursalRemito || !nroSucursal || !nroRemito"
+        foca-focus="idRemito !== -1">
+        Descargar
+    </button>
 </div>