diff --git a/src/all/komga/CHANGELOG.md b/src/all/komga/CHANGELOG.md
index e6df46885..6717df1cf 100644
--- a/src/all/komga/CHANGELOG.md
+++ b/src/all/komga/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.2.17
+
+Minimum Komga version required: `0.63.2`
+
+### Fix
+
+* list of collections for filtering could be empty in some conditions
+
 ## 1.2.16
 
 Minimum Komga version required: `0.59.0`
diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle
index 08d81dbae..e057c3a43 100644
--- a/src/all/komga/build.gradle
+++ b/src/all/komga/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Komga'
     pkgNameSuffix = 'all.komga'
     extClass = '.KomgaFactory'
-    extVersionCode = 16
+    extVersionCode = 17
     libVersion = '1.2'
 }
 
diff --git a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt
index b9635b428..c28f9b4d1 100644
--- a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt
+++ b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt
@@ -214,11 +214,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
                 "ENDED" -> SManga.COMPLETED
                 else -> SManga.UNKNOWN
             }
-            // TODO: remove safe calls in next iteration
-            genre = (
-                metadata.genres?.plus(metadata.tags ?: emptySet())
-                    ?: emptySet()
-                ).joinToString(", ")
+            genre = (metadata.genres + metadata.tags).joinToString(", ")
             description = metadata.summary
         }
 
@@ -227,10 +223,10 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
             Date().time
         else {
             try {
-                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US).parse(date)?.time ?: 0L
+                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US).parse(date).time
             } catch (ex: Exception) {
                 try {
-                    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S", Locale.US).parse(date)?.time ?: 0L
+                    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S", Locale.US).parse(date).time
                 } catch (ex: Exception) {
                     Date().time
                 }
diff --git a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt
index 614f8605d..8803ea769 100644
--- a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt
+++ b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt
@@ -32,9 +32,9 @@ data class SeriesMetadataDto(
     val ageRatingLock: Boolean,
     val language: String,
     val languageLock: Boolean,
-    val genres: Set<String>?, // TODO: remove optional in next iteration
+    val genres: Set<String>,
     val genresLock: Boolean,
-    val tags: Set<String>?, // TODO: remove optional in next iteration
+    val tags: Set<String>,
     val tagsLock: Boolean
 )
 
@@ -88,7 +88,7 @@ data class CollectionDto(
     val id: String,
     val name: String,
     val ordered: Boolean,
-    val seriesIds: List<Long>,
+    val seriesIds: List<String>,
     val createdDate: String,
     val lastModifiedDate: String,
     val filtered: Boolean