diff --git a/mobile/openapi/lib/model/add_assets_dto.dart b/mobile/openapi/lib/model/add_assets_dto.dart
index d0eb32449..930dc292f 100644
Binary files a/mobile/openapi/lib/model/add_assets_dto.dart and b/mobile/openapi/lib/model/add_assets_dto.dart differ
diff --git a/mobile/openapi/lib/model/add_assets_response_dto.dart b/mobile/openapi/lib/model/add_assets_response_dto.dart
index ba3b50095..73d7f7194 100644
Binary files a/mobile/openapi/lib/model/add_assets_response_dto.dart and b/mobile/openapi/lib/model/add_assets_response_dto.dart differ
diff --git a/mobile/openapi/lib/model/add_users_dto.dart b/mobile/openapi/lib/model/add_users_dto.dart
index d74265271..b6db1d1dc 100644
Binary files a/mobile/openapi/lib/model/add_users_dto.dart and b/mobile/openapi/lib/model/add_users_dto.dart differ
diff --git a/mobile/openapi/lib/model/check_existing_assets_dto.dart b/mobile/openapi/lib/model/check_existing_assets_dto.dart
index bc647b872..9eec51cd8 100644
Binary files a/mobile/openapi/lib/model/check_existing_assets_dto.dart and b/mobile/openapi/lib/model/check_existing_assets_dto.dart differ
diff --git a/mobile/openapi/lib/model/check_existing_assets_response_dto.dart b/mobile/openapi/lib/model/check_existing_assets_response_dto.dart
index afc48a0d1..66ef952e3 100644
Binary files a/mobile/openapi/lib/model/check_existing_assets_response_dto.dart and b/mobile/openapi/lib/model/check_existing_assets_response_dto.dart differ
diff --git a/mobile/openapi/lib/model/create_album_dto.dart b/mobile/openapi/lib/model/create_album_dto.dart
index 4e2cf6fb8..c1535d617 100644
Binary files a/mobile/openapi/lib/model/create_album_dto.dart and b/mobile/openapi/lib/model/create_album_dto.dart differ
diff --git a/mobile/openapi/lib/model/create_assets_share_link_dto.dart b/mobile/openapi/lib/model/create_assets_share_link_dto.dart
index 5749fc0b1..04d9d2f6a 100644
Binary files a/mobile/openapi/lib/model/create_assets_share_link_dto.dart and b/mobile/openapi/lib/model/create_assets_share_link_dto.dart differ
diff --git a/mobile/openapi/lib/model/delete_asset_dto.dart b/mobile/openapi/lib/model/delete_asset_dto.dart
index cc79b881d..cd5c7e353 100644
Binary files a/mobile/openapi/lib/model/delete_asset_dto.dart and b/mobile/openapi/lib/model/delete_asset_dto.dart differ
diff --git a/mobile/openapi/lib/model/download_files_dto.dart b/mobile/openapi/lib/model/download_files_dto.dart
index de6dd79cb..97899c971 100644
Binary files a/mobile/openapi/lib/model/download_files_dto.dart and b/mobile/openapi/lib/model/download_files_dto.dart differ
diff --git a/mobile/openapi/lib/model/get_asset_by_time_bucket_dto.dart b/mobile/openapi/lib/model/get_asset_by_time_bucket_dto.dart
index 8cd6ff51b..4b487ed87 100644
Binary files a/mobile/openapi/lib/model/get_asset_by_time_bucket_dto.dart and b/mobile/openapi/lib/model/get_asset_by_time_bucket_dto.dart differ
diff --git a/mobile/openapi/lib/model/remove_assets_dto.dart b/mobile/openapi/lib/model/remove_assets_dto.dart
index d7131b4f7..01eb558bd 100644
Binary files a/mobile/openapi/lib/model/remove_assets_dto.dart and b/mobile/openapi/lib/model/remove_assets_dto.dart differ
diff --git a/mobile/openapi/lib/model/smart_info_response_dto.dart b/mobile/openapi/lib/model/smart_info_response_dto.dart
index 9c9f42ef4..22e7f8c1b 100644
Binary files a/mobile/openapi/lib/model/smart_info_response_dto.dart and b/mobile/openapi/lib/model/smart_info_response_dto.dart differ
diff --git a/mobile/openapi/lib/model/system_config_template_storage_option_dto.dart b/mobile/openapi/lib/model/system_config_template_storage_option_dto.dart
index 0fd4db607..8ea0bdd38 100644
Binary files a/mobile/openapi/lib/model/system_config_template_storage_option_dto.dart and b/mobile/openapi/lib/model/system_config_template_storage_option_dto.dart differ
diff --git a/mobile/openapi/lib/model/update_asset_dto.dart b/mobile/openapi/lib/model/update_asset_dto.dart
index 6b783fdac..67e36d1a9 100644
Binary files a/mobile/openapi/lib/model/update_asset_dto.dart and b/mobile/openapi/lib/model/update_asset_dto.dart differ
diff --git a/server/openapi-generator/templates/mobile/serialization/native/native_class.mustache b/server/openapi-generator/templates/mobile/serialization/native/native_class.mustache
index 34f83c304..9dfc6931a 100644
--- a/server/openapi-generator/templates/mobile/serialization/native/native_class.mustache
+++ b/server/openapi-generator/templates/mobile/serialization/native/native_class.mustache
@@ -86,7 +86,7 @@ class {{{classname}}} {
     {{/isDate}}
     {{^isDateTime}}
       {{^isDate}}
-      json[r'{{{baseName}}}'] = this.{{{name}}};
+      json[r'{{{baseName}}}'] = this.{{{name}}}{{#isArray}}{{#uniqueItems}}{{#isNullable}}!{{/isNullable}}.toList(growable: false){{/uniqueItems}}{{/isArray}};
       {{/isDate}}
     {{/isDateTime}}
     {{#isNullable}}
@@ -200,8 +200,8 @@ class {{{classname}}} {
         {{{name}}}: {{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
             {{/isEnum}}
             {{^isEnum}}
-        {{{name}}}: json[r'{{{baseName}}}'] is {{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}
-            ? (json[r'{{{baseName}}}'] as {{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}).cast<{{{items.datatype}}}>()
+        {{{name}}}: json[r'{{{baseName}}}'] is Iterable
+            ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
             : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}},
             {{/isEnum}}
           {{/isArray}}