diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart
index 3c0ada44c..7c3b7cb3b 100644
--- a/lib/data/models/client_model.dart
+++ b/lib/data/models/client_model.dart
@@ -595,7 +595,7 @@ abstract class ClientEntity extends Object
 
       actions.add(EntityAction.clientPortal);
 
-      if (actions.isNotEmpty) {
+      if (actions.isNotEmpty && actions.last != null) {
         actions.add(null);
       }
 
@@ -624,7 +624,7 @@ abstract class ClientEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/company_gateway_model.dart b/lib/data/models/company_gateway_model.dart
index b71dc63a0..2761cce11 100644
--- a/lib/data/models/company_gateway_model.dart
+++ b/lib/data/models/company_gateway_model.dart
@@ -262,7 +262,7 @@ abstract class CompanyGatewayEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/design_model.dart b/lib/data/models/design_model.dart
index bd733d786..08f62980b 100644
--- a/lib/data/models/design_model.dart
+++ b/lib/data/models/design_model.dart
@@ -163,7 +163,7 @@ abstract class DesignEntity extends Object
       actions.add(EntityAction.clone);
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/document_model.dart b/lib/data/models/document_model.dart
index d1b061b54..efb629ebb 100644
--- a/lib/data/models/document_model.dart
+++ b/lib/data/models/document_model.dart
@@ -217,7 +217,7 @@ abstract class DocumentEntity extends Object
       actions.add(EntityAction.clone);
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/expense_category_model.dart b/lib/data/models/expense_category_model.dart
index 82914c8ec..444d8216e 100644
--- a/lib/data/models/expense_category_model.dart
+++ b/lib/data/models/expense_category_model.dart
@@ -92,7 +92,7 @@ abstract class ExpenseCategoryEntity extends Object
         actions.add(EntityAction.edit);
       }
 
-      if (actions.isNotEmpty) {
+      if (actions.isNotEmpty && actions.last != null) {
         actions.add(null);
       }
     }
diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart
index b4523c528..c599ded19 100644
--- a/lib/data/models/expense_model.dart
+++ b/lib/data/models/expense_model.dart
@@ -311,7 +311,7 @@ abstract class ExpenseEntity extends Object
       actions.add(EntityAction.clone);
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/gateway_token_model.dart b/lib/data/models/gateway_token_model.dart
index 9bb90524e..8938c04f3 100644
--- a/lib/data/models/gateway_token_model.dart
+++ b/lib/data/models/gateway_token_model.dart
@@ -160,7 +160,7 @@ abstract class GatewayTokenEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/group_model.dart b/lib/data/models/group_model.dart
index ba01440ac..61a2921e9 100644
--- a/lib/data/models/group_model.dart
+++ b/lib/data/models/group_model.dart
@@ -159,7 +159,7 @@ abstract class GroupEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index 5e75855b5..dc967eb6c 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -787,7 +787,7 @@ abstract class InvoiceEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
@@ -835,7 +835,9 @@ abstract class InvoiceEntity extends Object
         actions.add(EntityAction.cloneToOther);
       }
 
-      actions.add(null);
+      if (actions.isNotEmpty && actions.last != null) {
+        actions.add(null);
+      }
     }
 
     if (userCompany.canEditEntity(this) && !isDeleted) {
diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart
index f696ae92b..b346cfce8 100644
--- a/lib/data/models/payment_model.dart
+++ b/lib/data/models/payment_model.dart
@@ -399,7 +399,7 @@ abstract class PaymentEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart
index 60705cc51..669eb97cb 100644
--- a/lib/data/models/product_model.dart
+++ b/lib/data/models/product_model.dart
@@ -315,7 +315,7 @@ abstract class ProductEntity extends Object
       actions.add(EntityAction.clone);
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart
index c2657af6f..29ce56157 100644
--- a/lib/data/models/project_model.dart
+++ b/lib/data/models/project_model.dart
@@ -189,7 +189,7 @@ abstract class ProjectEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/subscription_model.dart b/lib/data/models/subscription_model.dart
index d47895e87..3bd9c946f 100644
--- a/lib/data/models/subscription_model.dart
+++ b/lib/data/models/subscription_model.dart
@@ -173,7 +173,7 @@ abstract class SubscriptionEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 0162720b5..0f53774f3 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -578,7 +578,7 @@ abstract class TaskEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/task_status_model.dart b/lib/data/models/task_status_model.dart
index bb96d44ac..0ca94dfce 100644
--- a/lib/data/models/task_status_model.dart
+++ b/lib/data/models/task_status_model.dart
@@ -106,7 +106,7 @@ abstract class TaskStatusEntity extends Object
       actions.add(EntityAction.edit);
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/tax_rate_model.dart b/lib/data/models/tax_rate_model.dart
index 268dd8ae4..59752fa80 100644
--- a/lib/data/models/tax_rate_model.dart
+++ b/lib/data/models/tax_rate_model.dart
@@ -143,7 +143,7 @@ abstract class TaxRateEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/token_model.dart b/lib/data/models/token_model.dart
index e656dc3a6..edc02dccc 100644
--- a/lib/data/models/token_model.dart
+++ b/lib/data/models/token_model.dart
@@ -160,7 +160,7 @@ abstract class TokenEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/user_model.dart b/lib/data/models/user_model.dart
index f367a2ade..e977e2b09 100644
--- a/lib/data/models/user_model.dart
+++ b/lib/data/models/user_model.dart
@@ -295,7 +295,7 @@ abstract class UserEntity extends Object
       actions.add(EntityAction.remove);
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/vendor_model.dart b/lib/data/models/vendor_model.dart
index 245058c58..0a24f6acd 100644
--- a/lib/data/models/vendor_model.dart
+++ b/lib/data/models/vendor_model.dart
@@ -202,7 +202,7 @@ abstract class VendorEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/lib/data/models/webhook_model.dart b/lib/data/models/webhook_model.dart
index 6007ce61e..ba7ccb76d 100644
--- a/lib/data/models/webhook_model.dart
+++ b/lib/data/models/webhook_model.dart
@@ -233,7 +233,7 @@ abstract class WebhookEntity extends Object
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
 
diff --git a/stubs/data/models/stub_model b/stubs/data/models/stub_model
index aaba89990..db6a9bce6 100644
--- a/stubs/data/models/stub_model
+++ b/stubs/data/models/stub_model
@@ -91,7 +91,7 @@ abstract class StubEntity extends Object with BaseEntity implements Built<StubEn
       }
     }
 
-    if (actions.isNotEmpty) {
+    if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }