diff --git a/lib/redux/client/client_state.dart b/lib/redux/client/client_state.dart
index 67423746e..874654042 100644
--- a/lib/redux/client/client_state.dart
+++ b/lib/redux/client/client_state.dart
@@ -55,7 +55,7 @@ abstract class ClientState implements Built<ClientState, ClientStateBuilder> {
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   bool get isLoaded => lastUpdated != null && lastUpdated > 0;
diff --git a/lib/redux/credit/credit_state.dart b/lib/redux/credit/credit_state.dart
index 7171fc791..8fe72ed37 100644
--- a/lib/redux/credit/credit_state.dart
+++ b/lib/redux/credit/credit_state.dart
@@ -47,7 +47,7 @@ abstract class CreditState implements Built<CreditState, CreditStateBuilder> {
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<CreditState> get serializer => _$creditStateSerializer;
diff --git a/lib/redux/design/design_state.dart b/lib/redux/design/design_state.dart
index 0e09b91db..ee04c918a 100644
--- a/lib/redux/design/design_state.dart
+++ b/lib/redux/design/design_state.dart
@@ -47,7 +47,7 @@ abstract class DesignState implements Built<DesignState, DesignStateBuilder> {
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<DesignState> get serializer => _$designStateSerializer;
diff --git a/lib/redux/expense/expense_state.dart b/lib/redux/expense/expense_state.dart
index 14a451084..c93eb5152 100644
--- a/lib/redux/expense/expense_state.dart
+++ b/lib/redux/expense/expense_state.dart
@@ -49,7 +49,7 @@ abstract class ExpenseState
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<ExpenseState> get serializer => _$expenseStateSerializer;
diff --git a/lib/redux/invoice/invoice_state.dart b/lib/redux/invoice/invoice_state.dart
index f7a92b848..bdf46a9f7 100644
--- a/lib/redux/invoice/invoice_state.dart
+++ b/lib/redux/invoice/invoice_state.dart
@@ -58,7 +58,7 @@ abstract class InvoiceState
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<InvoiceState> get serializer => _$invoiceStateSerializer;
diff --git a/lib/redux/payment/payment_state.dart b/lib/redux/payment/payment_state.dart
index 89439a84d..80f265bc5 100644
--- a/lib/redux/payment/payment_state.dart
+++ b/lib/redux/payment/payment_state.dart
@@ -51,7 +51,7 @@ abstract class PaymentState
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<PaymentState> get serializer => _$paymentStateSerializer;
diff --git a/lib/redux/product/product_state.dart b/lib/redux/product/product_state.dart
index 9ff29d9c9..84ad3fdb9 100644
--- a/lib/redux/product/product_state.dart
+++ b/lib/redux/product/product_state.dart
@@ -46,7 +46,7 @@ abstract class ProductState
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   bool get isLoaded => lastUpdated != null && lastUpdated > 0;
diff --git a/lib/redux/project/project_state.dart b/lib/redux/project/project_state.dart
index 63446b019..545f19119 100644
--- a/lib/redux/project/project_state.dart
+++ b/lib/redux/project/project_state.dart
@@ -49,7 +49,7 @@ abstract class ProjectState
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<ProjectState> get serializer => _$projectStateSerializer;
diff --git a/lib/redux/quote/quote_state.dart b/lib/redux/quote/quote_state.dart
index a9ccdf6a0..41ea37424 100644
--- a/lib/redux/quote/quote_state.dart
+++ b/lib/redux/quote/quote_state.dart
@@ -51,7 +51,7 @@ abstract class QuoteState implements Built<QuoteState, QuoteStateBuilder> {
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<QuoteState> get serializer => _$quoteStateSerializer;
diff --git a/lib/redux/task/task_state.dart b/lib/redux/task/task_state.dart
index 0240e769c..c38eeaf19 100644
--- a/lib/redux/task/task_state.dart
+++ b/lib/redux/task/task_state.dart
@@ -48,7 +48,7 @@ abstract class TaskState implements Built<TaskState, TaskStateBuilder> {
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<TaskState> get serializer => _$taskStateSerializer;
diff --git a/lib/redux/vendor/vendor_state.dart b/lib/redux/vendor/vendor_state.dart
index 130199ef9..907ceef7d 100644
--- a/lib/redux/vendor/vendor_state.dart
+++ b/lib/redux/vendor/vendor_state.dart
@@ -48,7 +48,7 @@ abstract class VendorState implements Built<VendorState, VendorStateBuilder> {
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }
 
   static Serializer<VendorState> get serializer => _$vendorStateSerializer;
diff --git a/stubs/redux/stub/stub_state b/stubs/redux/stub/stub_state
index c46896ca6..c34382a60 100644
--- a/stubs/redux/stub/stub_state
+++ b/stubs/redux/stub/stub_state
@@ -47,7 +47,7 @@ abstract class StubState implements Built<StubState, StubStateBuilder> {
     return rebuild((b) => b
       ..lastUpdated = DateTime.now().millisecondsSinceEpoch
       ..map.addAll(map)
-      ..list.replace(map.keys));
+      ..list.replace((map.keys.toList() + list.toList()).toSet().toList()));
   }