diff --git a/modules/invoiceIn/back/methods/invoice-in/unbilledClients.js b/modules/invoiceIn/back/methods/invoice-in/unbilledClients.js
index ad39bc547f..790185d25a 100644
--- a/modules/invoiceIn/back/methods/invoice-in/unbilledClients.js
+++ b/modules/invoiceIn/back/methods/invoice-in/unbilledClients.js
@@ -89,8 +89,8 @@ module.exports = Self => {
                         WHERE t.shipped BETWEEN ? AND ?
                             AND t.refFk IS NULL
                             AND c.typeFk IN ('normal','trust')
-                        GROUP BY t.clientFk
-                    HAVING amount <> 0`, [args.from, args.to]));
+                        GROUP BY t.clientFk, negativeBase.taxableBase
+                    HAVING amount < 0`, [args.from, args.to]));
 
         stmt = new ParameterizedSQL(`
             SELECT f.*