diff --git a/src/main/kotlin/fr/shikkanime/jobs/UpdateEpisodeJob.kt b/src/main/kotlin/fr/shikkanime/jobs/UpdateEpisodeJob.kt
index 9bb7e63a..ae34ff78 100644
--- a/src/main/kotlin/fr/shikkanime/jobs/UpdateEpisodeJob.kt
+++ b/src/main/kotlin/fr/shikkanime/jobs/UpdateEpisodeJob.kt
@@ -137,12 +137,14 @@ class UpdateEpisodeJob : AbstractJob {
                 needRefreshCache = true
             }
 
-            if (originalEpisode.description != mapping.description && !originalEpisode.description.isNullOrBlank() && languageCacheService.detectLanguage(
-                    originalEpisode.description
-                ) == mapping.anime!!.countryCode!!.name.lowercase()
+            val trimmedDescription = originalEpisode.description?.take(Constant.MAX_DESCRIPTION_LENGTH)
+
+            if (trimmedDescription != mapping.description &&
+                !trimmedDescription.isNullOrBlank() &&
+                languageCacheService.detectLanguage(trimmedDescription) == mapping.anime!!.countryCode!!.name.lowercase()
             ) {
-                mapping.description = originalEpisode.description
-                logger.info("Description updated for $mappingIdentifier to ${originalEpisode.description}")
+                mapping.description = trimmedDescription
+                logger.info("Description updated for $mappingIdentifier to $trimmedDescription")
                 hasChanged = true
                 needRefreshCache = true
             }
diff --git a/src/main/kotlin/fr/shikkanime/services/EpisodeVariantService.kt b/src/main/kotlin/fr/shikkanime/services/EpisodeVariantService.kt
index 164bef5f..018b00fa 100644
--- a/src/main/kotlin/fr/shikkanime/services/EpisodeVariantService.kt
+++ b/src/main/kotlin/fr/shikkanime/services/EpisodeVariantService.kt
@@ -184,7 +184,7 @@ class EpisodeVariantService : AbstractService<EpisodeVariant, EpisodeVariantRepo
                 number = episode.number,
                 duration = episode.duration,
                 title = episode.title,
-                description = episode.description,
+                description = episode.description?.take(Constant.MAX_DESCRIPTION_LENGTH),
                 image = episode.image,
             ).apply {
                 status = StringUtils.getStatus(this)
diff --git a/src/main/kotlin/fr/shikkanime/utils/Constant.kt b/src/main/kotlin/fr/shikkanime/utils/Constant.kt
index 71ec8994..2ab4f073 100644
--- a/src/main/kotlin/fr/shikkanime/utils/Constant.kt
+++ b/src/main/kotlin/fr/shikkanime/utils/Constant.kt
@@ -44,6 +44,7 @@ object Constant {
     val baseUrl: String = System.getenv("BASE_URL") ?: "http://localhost:$PORT"
     val DEFAULT_IMAGE_PREVIEW = "$baseUrl/assets/img/episode_no_image_preview.jpg"
     const val DEFAULT_CACHE_DURATION = 31536000 // 1 year
+    const val MAX_DESCRIPTION_LENGTH = 1_000
 
     init {
         abstractPlatforms.forEach {
diff --git a/src/test/kotlin/fr/shikkanime/jobs/FetchOldEpisodesJobTest.kt b/src/test/kotlin/fr/shikkanime/jobs/FetchOldEpisodesJobTest.kt
index 9c303178..4ef941fe 100644
--- a/src/test/kotlin/fr/shikkanime/jobs/FetchOldEpisodesJobTest.kt
+++ b/src/test/kotlin/fr/shikkanime/jobs/FetchOldEpisodesJobTest.kt
@@ -83,4 +83,16 @@ class FetchOldEpisodesJobTest {
         val episodes = episodeMappingService.findAllByAnime(anime)
         assertTrue(episodes.any { it.season == 1 && it.number == 13 })
     }
+
+    @Test
+    fun `failed to fetch due to long description`() {
+        configService.save(Config(propertyKey = ConfigPropertyKey.LAST_FETCH_OLD_EPISODES.key, propertyValue = "2023-02-13"))
+        configService.save(Config(propertyKey = ConfigPropertyKey.FETCH_OLD_EPISODES_RANGE.key, propertyValue = "14"))
+        configService.save(Config(propertyKey = ConfigPropertyKey.FETCH_OLD_EPISODES_LIMIT.key, propertyValue = "6"))
+        MapCache.invalidate(Config::class.java)
+        crunchyrollPlatform.configuration?.availableCountries?.add(CountryCode.FR)
+        fetchOldEpisodesJob.run()
+        val animes = animeService.findAll()
+        animes.forEach { println(it.name) }
+    }
 }
\ No newline at end of file