diff --git a/lib/data/models/design_model.dart b/lib/data/models/design_model.dart
index 4aa9a9cdf..aaeb6aaac 100644
--- a/lib/data/models/design_model.dart
+++ b/lib/data/models/design_model.dart
@@ -2,6 +2,7 @@ import 'package:built_value/built_value.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/serializer.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
 
 part 'design_model.g.dart';
@@ -40,9 +41,9 @@ abstract class DesignEntity extends Object
     with BaseEntity
     implements Built<DesignEntity, DesignEntityBuilder> {
 
-  factory DesignEntity() {
+  factory DesignEntity({String id, AppState state}) {
     return _$DesignEntity._(
-      id: BaseEntity.nextId,
+      id: id ?? BaseEntity.nextId,
       isChanged: false,
       // STARTER: constructor - do not remove comment
     );
diff --git a/stubs/data/models/stub_model b/stubs/data/models/stub_model
index 64a74c767..0793c1ffd 100644
--- a/stubs/data/models/stub_model
+++ b/stubs/data/models/stub_model
@@ -1,6 +1,7 @@
 import 'package:built_value/built_value.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/serializer.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
 
@@ -40,9 +41,9 @@ abstract class StubEntity extends Object with BaseEntity implements Built<StubEn
 
   // STARTER: properties - do not remove comment
 
-  factory StubEntity() {
+  factory StubEntity({String id, AppState state}) {
     return _$StubEntity._(
-      id: BaseEntity.nextId,
+      id: id ?? BaseEntity.nextId,
       isChanged: false,
       // STARTER: constructor - do not remove comment
     );