diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
index 4a2f0d399..2480047b9 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -415,13 +415,6 @@ class EHentai(
                 Page(i, s)
             }
         }!!
-        .doOnNext { pages ->
-            if (pages.any { it.url == "https://$domain/img/509.gif" }) {
-                throw Exception(
-                    "Hit page limit",
-                )
-            }
-        }
 
     private fun fetchChapterPage(
         chapter: SChapter,
@@ -769,6 +762,9 @@ class EHentai(
             select("#loadfail").attr("onclick").nullIfBlank()?.let {
                 page.url = addParam(page.url, "nl", it.substring(it.indexOf('\'') + 1 until it.lastIndexOf('\'')))
             }
+            if (currentImage == "https://ehgt.org/g/509.gif") {
+                throw Exception("Exceeded page quota")
+            }
             return currentImage
         }
     }