diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
index 6f93d5f13..86cf35264 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
@@ -455,7 +455,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
             // Clear
             if (state == STATE_DOWNLOADING) {
                 mPageErrorMap.remove(index)
-            } else if (state == STATE_FINISHED || state == STATE_FAILED) {
+            } else if (isStateDone(state)) {
                 mPagePercentMap.remove(index)
             }
 
@@ -471,7 +471,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS
         } else if (state == STATE_FINISHED) {
             notifyPageSuccess(index)
         }
-        if (mFinishedPages.get() == size) notifyAllPageDownloaded()
+        if (mDownloadedPages.get() == size) notifyAllPageDownloaded()
     }
 
     @IntDef(MODE_READ, MODE_DOWNLOAD)