diff --git a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
index da07ccb53..bec66ef49 100644
--- a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
+++ b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
@@ -46,14 +46,14 @@ abstract class EHentai(
     }
 
     private val webViewCookieManager: CookieManager by lazy { CookieManager.getInstance() }
-    private val memberId: String = getMemberIdPref()
-    private val passHash: String = getPassHashPref()
+    private val memberId: String by lazy { getMemberIdPref() }
+    private val passHash: String by lazy { getPassHashPref() }
 
     override val baseUrl: String
-        get() = if (memberId.isNotEmpty() && passHash.isNotEmpty()) {
-            "https://exhentai.org"
-        } else {
-            "https://e-hentai.org"
+        get() = when {
+            System.getenv("CI") == "true" -> "https://e-hentai.org"
+            memberId.isNotEmpty() && passHash.isNotEmpty() -> "https://exhentai.org"
+            else -> "https://e-hentai.org"
         }
 
     override val supportsLatest = true
@@ -82,7 +82,7 @@ abstract class EHentai(
             val manga = mangaElements[i].let {
                 SManga.create().apply {
                     // Get title
-                    it.select("a")?.first()?.apply {
+                    it.selectFirst("a")?.apply {
                         title = this.select(".glink").text()
                         url = ExGalleryMetadata.normalizeUrl(attr("href"))
                         if (i == mangaElements.lastIndex) {