diff --git a/src/fr/mangakawaii/build.gradle b/src/fr/mangakawaii/build.gradle
index fcf0fcdfc..ef9697360 100644
--- a/src/fr/mangakawaii/build.gradle
+++ b/src/fr/mangakawaii/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Mangakawaii'
     pkgNameSuffix = 'fr.mangakawaii'
     extClass = '.MangaKawaii'
-    extVersionCode = 20
+    extVersionCode = 21
     libVersion = '1.2'
 }
 
diff --git a/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt b/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt
index 822b698bd..ff8c26146 100644
--- a/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt
+++ b/src/fr/mangakawaii/src/eu/kanade/tachiyomi/extension/fr/mangakawaii/MangaKawaii.kt
@@ -39,7 +39,7 @@ class MangaKawaii : ParsedHttpSource() {
     override fun popularMangaSelector() = "a.hot-manga__item "
     override fun latestUpdatesSelector() = ".section__list-group li div.section__list-group-left"
     override fun searchMangaSelector() = "h1 + ul a[href*=manga]"
-    override fun chapterListSelector() = "tr[class*=volume-]"
+    override fun chapterListSelector() = "tr[class*=volume-]:has(td)"
 
     override fun popularMangaNextPageSelector() = "a[rel=next]"
     override fun latestUpdatesNextPageSelector(): String? = null
@@ -82,7 +82,7 @@ class MangaKawaii : ParsedHttpSource() {
         chapter.name = element.select("td.table__chapter").select("span").text().trim()
         chapter.chapter_number = element.select("td.table__chapter").select("span").text().substringAfter("Chapitre").replace(Regex("""[,-]"""), ".").trim().toFloatOrNull()
             ?: -1F
-        chapter.date_upload = parseDate(element.select("td.table__date").text())
+        chapter.date_upload = element.select("td.table__date").firstOrNull()?.text()?.let { parseDate(it) } ?: 0
         return chapter
     }