diff --git a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt
index ee8a96fee..723a31bbe 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt
@@ -559,8 +559,17 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
             if (force) currentJob?.cancel()
             if (currentJob?.isActive != true) {
                 mFetcherJobMap[index] = launch {
-                    mSemaphore.withPermit {
-                        doInJob(index, force, orgImg)
+                    runCatching {
+                        mSemaphore.withPermit {
+                            doInJob(index, force, orgImg)
+                        }
+                    }.onFailure {
+                        if (it is CancellationException) {
+                            Log.d(WORKER_DEBUG_TAG, "Download image $index cancelled")
+                            updatePageState(index, STATE_FAILED, "Cancelled")
+                            throw it
+                        }
+                        updatePageState(index, STATE_FAILED, ExceptionUtils.getReadableString(it))
                     }
                 }
             }
@@ -623,7 +632,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
             var error: String? = null
             var forceHtml = false
             val original = Settings.downloadOriginImage || orgImg
-            runCatching {
+            runSuspendCatching {
                 repeat(2) { retries ->
                     var imageUrl: String? = null
                     var localShowKey: String?
@@ -716,14 +725,8 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
                 }
             }.onFailure {
                 when (it) {
-                    is CancellationException -> {
-                        Log.d(WORKER_DEBUG_TAG, "Download image $index cancelled")
-                        error = "Cancelled"
-                        updatePageState(index, STATE_FAILED, error)
-                        throw it
-                    }
-
                     is QuotaExceededException -> notifyGet509(index)
+                    // TODO: Check IP ban
                 }
                 error = ExceptionUtils.getReadableString(it)
             }
@@ -753,18 +756,22 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
 
             private suspend fun doInJob(index: Int) {
                 mFetcherJobMap[index]?.takeIf { it.isActive }?.join()
-                val src = mSpiderDen.getImageSource(index) ?: return
-                val image = mSemaphore.withPermit { Image.decode(src) }
                 runCatching {
-                    currentCoroutineContext().ensureActive()
-                }.onFailure {
-                    image?.recycle()
-                    throw it
-                }
-                if (image == null) {
-                    notifyGetImageFailure(index, DECODE_ERROR)
-                } else {
+                    val src = mSpiderDen.getImageSource(index) ?: return
+                    val image = mSemaphore.withPermit { Image.decode(src) }
+                    checkNotNull(image)
+                    runCatching {
+                        currentCoroutineContext().ensureActive()
+                    }.onFailure {
+                        image.recycle()
+                        throw it
+                    }
                     notifyGetImageSuccess(index, image)
+                }.onFailure {
+                    notifyGetImageFailure(index, DECODE_ERROR)
+                    if (it is CancellationException) {
+                        throw it
+                    }
                 }
             }
         }
diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
index 46f34afba..02758495b 100644
--- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
+++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
@@ -73,6 +73,7 @@ class PagerPageHolder(
         super.onDetachedFromWindow()
         cancelProgressJob()
         unsubscribeStatus()
+        progressIndicator.hide()
     }
 
     private fun launchProgressJob() {
diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
index e62f5c991..a53b9268d 100644
--- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
+++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
@@ -111,6 +111,7 @@ class WebtoonPageHolder(
     override fun recycle() {
         statusJob?.cancel()
         cancelProgressJob()
+        progressIndicator.hide()
 
         removeErrorLayout()
         frame.recycle()
@@ -211,6 +212,7 @@ class WebtoonPageHolder(
      * Called when the page has an error.
      */
     private fun setError() {
+        progressIndicator.hide()
         progressContainer.isVisible = false
         initErrorLayout()
     }