diff --git a/src/vi/hentaivn/build.gradle b/src/vi/hentaivn/build.gradle
index 61c702506..d8b62e87b 100644
--- a/src/vi/hentaivn/build.gradle
+++ b/src/vi/hentaivn/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'HentaiVN'
     pkgNameSuffix = 'vi.hentaivn'
     extClass = '.HentaiVN'
-    extVersionCode = 30
+    extVersionCode = 31
     isNsfw = true
 }
 
diff --git a/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt b/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt
index 3c57e8900..3e6e02baf 100644
--- a/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt
+++ b/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt
@@ -42,20 +42,17 @@ class HentaiVN : ParsedHttpSource(), ConfigurableSource {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override val name = "HentaiVN"
-
     private val defaultBaseUrl = "https://hentaivn.tv"
-    override val baseUrl = preferences.getString(PREF_KEY_BASE_URL, defaultBaseUrl)!!
-
-    private val domain = baseUrl.toHttpUrl().host
-    private val searchUrl = "$baseUrl/forum/search-plus.php"
-    private val searchByAuthorUrl = "$baseUrl/tim-kiem-tac-gia.html"
-    private val searchAllURL = "$baseUrl/tim-kiem-truyen.html"
+    override val baseUrl by lazy { preferences.getString(PREF_KEY_BASE_URL, defaultBaseUrl)!! }
 
+    override val name = "HentaiVN"
     override val lang = "vi"
-
     override val supportsLatest = true
 
+    private val searchUrl by lazy { "$baseUrl/forum/search-plus.php" }
+    private val searchByAuthorUrl by lazy { "$baseUrl/tim-kiem-tac-gia.html" }
+    private val searchAllURL by lazy { "$baseUrl/tim-kiem-truyen.html" }
+
     override val client: OkHttpClient by lazy {
         val baseClient = if (preferences.getBoolean(PREF_KEY_ENABLE_CLOUDFLARE_BYPASS, true)) {
             network.cloudflareClient
@@ -63,6 +60,7 @@ class HentaiVN : ParsedHttpSource(), ConfigurableSource {
             network.client
         }
 
+        val domain = baseUrl.toHttpUrl().host
         baseClient.newBuilder()
             .addNetworkInterceptor(CookieInterceptor(domain, "view1", "1"))
             .addNetworkInterceptor(CookieInterceptor(domain, "view4", "1"))