diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
index 1aeb4f6..29d82e3 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
@@ -948,9 +948,8 @@ open class DashboardService(
                     + " from team t3"
                     + " left join project p3 on t3.teamLead = p3.teamLead"
                     + " left join customer c3 on p3.customerId = c3.id"
-                    + " left join invoice i3 on p3.code = i3.projectCode"
+                    + " left join invoice i3 on p3.code = i3.projectCode and i3.deleted = 0" //update invoice deletable
                     + " where t3.deleted = 0"
-                    + " and i3.deleted = 0" //update invoice deletable
                     + " and p3.status = 'On-going'"
                 )
                 if (args != null) {