diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
index e0ae5e0..8ed6387 100644
--- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
+++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
@@ -43,10 +43,11 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     init {
         // TODO: Dispatchers.IO not available in KMM, an alternative solution should be found
         connectivityStatus.start()
-        runBlocking {
-            updateApiVersion()
-            dateUtils = DateUtils(appSettingsService)
-            reloadBadges()
+        if (appSettingsService.getBaseUrl() != "") {
+            runBlocking {
+                updateApiVersion()
+                reloadBadges()
+            }
         }
     }
 
@@ -408,6 +409,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                 appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
             }
         }
+        dateUtils = DateUtils(appSettingsService)
     }
 
     fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride