diff --git a/mobile/openapi/lib/model/add_assets_dto.dart b/mobile/openapi/lib/model/add_assets_dto.dart
index d0eb324493..930dc292f7 100644
--- a/mobile/openapi/lib/model/add_assets_dto.dart
+++ b/mobile/openapi/lib/model/add_assets_dto.dart
@@ -55,8 +55,8 @@ class AddAssetsDto {
       }());
 
       return AddAssetsDto(
-        assetIds: json[r'assetIds'] is List
-            ? (json[r'assetIds'] as List).cast<String>()
+        assetIds: json[r'assetIds'] is Iterable
+            ? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
diff --git a/mobile/openapi/lib/model/add_assets_response_dto.dart b/mobile/openapi/lib/model/add_assets_response_dto.dart
index ba3b500953..73d7f71947 100644
--- a/mobile/openapi/lib/model/add_assets_response_dto.dart
+++ b/mobile/openapi/lib/model/add_assets_response_dto.dart
@@ -78,8 +78,8 @@ class AddAssetsResponseDto {
 
       return AddAssetsResponseDto(
         successfullyAdded: mapValueOfType<int>(json, r'successfullyAdded')!,
-        alreadyInAlbum: json[r'alreadyInAlbum'] is List
-            ? (json[r'alreadyInAlbum'] as List).cast<String>()
+        alreadyInAlbum: json[r'alreadyInAlbum'] is Iterable
+            ? (json[r'alreadyInAlbum'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         album: AlbumResponseDto.fromJson(json[r'album']),
       );
diff --git a/mobile/openapi/lib/model/add_users_dto.dart b/mobile/openapi/lib/model/add_users_dto.dart
index d742652716..b6db1d1dc7 100644
--- a/mobile/openapi/lib/model/add_users_dto.dart
+++ b/mobile/openapi/lib/model/add_users_dto.dart
@@ -55,8 +55,8 @@ class AddUsersDto {
       }());
 
       return AddUsersDto(
-        sharedUserIds: json[r'sharedUserIds'] is List
-            ? (json[r'sharedUserIds'] as List).cast<String>()
+        sharedUserIds: json[r'sharedUserIds'] is Iterable
+            ? (json[r'sharedUserIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
diff --git a/mobile/openapi/lib/model/check_existing_assets_dto.dart b/mobile/openapi/lib/model/check_existing_assets_dto.dart
index bc647b8729..9eec51cd8d 100644
--- a/mobile/openapi/lib/model/check_existing_assets_dto.dart
+++ b/mobile/openapi/lib/model/check_existing_assets_dto.dart
@@ -61,8 +61,8 @@ class CheckExistingAssetsDto {
       }());
 
       return CheckExistingAssetsDto(
-        deviceAssetIds: json[r'deviceAssetIds'] is List
-            ? (json[r'deviceAssetIds'] as List).cast<String>()
+        deviceAssetIds: json[r'deviceAssetIds'] is Iterable
+            ? (json[r'deviceAssetIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         deviceId: mapValueOfType<String>(json, r'deviceId')!,
       );
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 afc48a0d1a..66ef952e31 100644
--- a/mobile/openapi/lib/model/check_existing_assets_response_dto.dart
+++ b/mobile/openapi/lib/model/check_existing_assets_response_dto.dart
@@ -55,8 +55,8 @@ class CheckExistingAssetsResponseDto {
       }());
 
       return CheckExistingAssetsResponseDto(
-        existingIds: json[r'existingIds'] is List
-            ? (json[r'existingIds'] as List).cast<String>()
+        existingIds: json[r'existingIds'] is Iterable
+            ? (json[r'existingIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
diff --git a/mobile/openapi/lib/model/create_album_dto.dart b/mobile/openapi/lib/model/create_album_dto.dart
index 4e2cf6fb84..c1535d6171 100644
--- a/mobile/openapi/lib/model/create_album_dto.dart
+++ b/mobile/openapi/lib/model/create_album_dto.dart
@@ -68,11 +68,11 @@ class CreateAlbumDto {
 
       return CreateAlbumDto(
         albumName: mapValueOfType<String>(json, r'albumName')!,
-        sharedWithUserIds: json[r'sharedWithUserIds'] is List
-            ? (json[r'sharedWithUserIds'] as List).cast<String>()
+        sharedWithUserIds: json[r'sharedWithUserIds'] is Iterable
+            ? (json[r'sharedWithUserIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        assetIds: json[r'assetIds'] is List
-            ? (json[r'assetIds'] as List).cast<String>()
+        assetIds: json[r'assetIds'] is Iterable
+            ? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
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 5749fc0b1a..04d9d2f6ac 100644
--- a/mobile/openapi/lib/model/create_assets_share_link_dto.dart
+++ b/mobile/openapi/lib/model/create_assets_share_link_dto.dart
@@ -135,8 +135,8 @@ class CreateAssetsShareLinkDto {
       }());
 
       return CreateAssetsShareLinkDto(
-        assetIds: json[r'assetIds'] is List
-            ? (json[r'assetIds'] as List).cast<String>()
+        assetIds: json[r'assetIds'] is Iterable
+            ? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         expiresAt: mapValueOfType<String>(json, r'expiresAt'),
         allowUpload: mapValueOfType<bool>(json, r'allowUpload'),
diff --git a/mobile/openapi/lib/model/delete_asset_dto.dart b/mobile/openapi/lib/model/delete_asset_dto.dart
index cc79b881d9..cd5c7e3537 100644
--- a/mobile/openapi/lib/model/delete_asset_dto.dart
+++ b/mobile/openapi/lib/model/delete_asset_dto.dart
@@ -55,8 +55,8 @@ class DeleteAssetDto {
       }());
 
       return DeleteAssetDto(
-        ids: json[r'ids'] is List
-            ? (json[r'ids'] as List).cast<String>()
+        ids: json[r'ids'] is Iterable
+            ? (json[r'ids'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
diff --git a/mobile/openapi/lib/model/download_files_dto.dart b/mobile/openapi/lib/model/download_files_dto.dart
index de6dd79cb0..97899c9713 100644
--- a/mobile/openapi/lib/model/download_files_dto.dart
+++ b/mobile/openapi/lib/model/download_files_dto.dart
@@ -55,8 +55,8 @@ class DownloadFilesDto {
       }());
 
       return DownloadFilesDto(
-        assetIds: json[r'assetIds'] is List
-            ? (json[r'assetIds'] as List).cast<String>()
+        assetIds: json[r'assetIds'] is Iterable
+            ? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
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 8cd6ff51ba..4b487ed870 100644
--- a/mobile/openapi/lib/model/get_asset_by_time_bucket_dto.dart
+++ b/mobile/openapi/lib/model/get_asset_by_time_bucket_dto.dart
@@ -55,8 +55,8 @@ class GetAssetByTimeBucketDto {
       }());
 
       return GetAssetByTimeBucketDto(
-        timeBucket: json[r'timeBucket'] is List
-            ? (json[r'timeBucket'] as List).cast<String>()
+        timeBucket: json[r'timeBucket'] is Iterable
+            ? (json[r'timeBucket'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
diff --git a/mobile/openapi/lib/model/remove_assets_dto.dart b/mobile/openapi/lib/model/remove_assets_dto.dart
index d7131b4f7a..01eb558bd0 100644
--- a/mobile/openapi/lib/model/remove_assets_dto.dart
+++ b/mobile/openapi/lib/model/remove_assets_dto.dart
@@ -55,8 +55,8 @@ class RemoveAssetsDto {
       }());
 
       return RemoveAssetsDto(
-        assetIds: json[r'assetIds'] is List
-            ? (json[r'assetIds'] as List).cast<String>()
+        assetIds: json[r'assetIds'] is Iterable
+            ? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
diff --git a/mobile/openapi/lib/model/smart_info_response_dto.dart b/mobile/openapi/lib/model/smart_info_response_dto.dart
index 9c9f42ef44..22e7f8c1b9 100644
--- a/mobile/openapi/lib/model/smart_info_response_dto.dart
+++ b/mobile/openapi/lib/model/smart_info_response_dto.dart
@@ -69,11 +69,11 @@ class SmartInfoResponseDto {
       }());
 
       return SmartInfoResponseDto(
-        tags: json[r'tags'] is List
-            ? (json[r'tags'] as List).cast<String>()
+        tags: json[r'tags'] is Iterable
+            ? (json[r'tags'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        objects: json[r'objects'] is List
-            ? (json[r'objects'] as List).cast<String>()
+        objects: json[r'objects'] is Iterable
+            ? (json[r'objects'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
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 0fd4db6075..8ea0bdd38e 100644
--- a/mobile/openapi/lib/model/system_config_template_storage_option_dto.dart
+++ b/mobile/openapi/lib/model/system_config_template_storage_option_dto.dart
@@ -91,26 +91,26 @@ class SystemConfigTemplateStorageOptionDto {
       }());
 
       return SystemConfigTemplateStorageOptionDto(
-        yearOptions: json[r'yearOptions'] is List
-            ? (json[r'yearOptions'] as List).cast<String>()
+        yearOptions: json[r'yearOptions'] is Iterable
+            ? (json[r'yearOptions'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        monthOptions: json[r'monthOptions'] is List
-            ? (json[r'monthOptions'] as List).cast<String>()
+        monthOptions: json[r'monthOptions'] is Iterable
+            ? (json[r'monthOptions'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        dayOptions: json[r'dayOptions'] is List
-            ? (json[r'dayOptions'] as List).cast<String>()
+        dayOptions: json[r'dayOptions'] is Iterable
+            ? (json[r'dayOptions'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        hourOptions: json[r'hourOptions'] is List
-            ? (json[r'hourOptions'] as List).cast<String>()
+        hourOptions: json[r'hourOptions'] is Iterable
+            ? (json[r'hourOptions'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        minuteOptions: json[r'minuteOptions'] is List
-            ? (json[r'minuteOptions'] as List).cast<String>()
+        minuteOptions: json[r'minuteOptions'] is Iterable
+            ? (json[r'minuteOptions'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        secondOptions: json[r'secondOptions'] is List
-            ? (json[r'secondOptions'] as List).cast<String>()
+        secondOptions: json[r'secondOptions'] is Iterable
+            ? (json[r'secondOptions'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        presetOptions: json[r'presetOptions'] is List
-            ? (json[r'presetOptions'] as List).cast<String>()
+        presetOptions: json[r'presetOptions'] is Iterable
+            ? (json[r'presetOptions'] as Iterable).cast<String>().toList(growable: false)
             : const [],
       );
     }
diff --git a/mobile/openapi/lib/model/update_asset_dto.dart b/mobile/openapi/lib/model/update_asset_dto.dart
index 6b783fdac0..67e36d1a9a 100644
--- a/mobile/openapi/lib/model/update_asset_dto.dart
+++ b/mobile/openapi/lib/model/update_asset_dto.dart
@@ -103,8 +103,8 @@ class UpdateAssetDto {
       }());
 
       return UpdateAssetDto(
-        tagIds: json[r'tagIds'] is List
-            ? (json[r'tagIds'] as List).cast<String>()
+        tagIds: json[r'tagIds'] is Iterable
+            ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
         isArchived: mapValueOfType<bool>(json, r'isArchived'),
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 34f83c304b..9dfc6931a7 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}}