diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/HomeServerVersion.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/HomeServerVersion.kt
index 514f29a550..7e0a95dfef 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/HomeServerVersion.kt
@@ -49,12 +49,12 @@ internal data class HomeServerVersion(
             )
         }
 
-        val r0_0_1 = parse("r0.0.1")!!
-        val r0_1_0 = parse("r0.1.0")!!
-        val r0_2_0 = parse("r0.2.0")!!
-        val r0_3_0 = parse("r0.3.0")!!
-        val r0_4_0 = parse("r0.4.0")!!
-        val r0_5_0 = parse("r0.5.0")!!
-        val r0_6_0 = parse("r0.6.0")!!
+        val r0_0_0 = HomeServerVersion(major = 0, minor = 0, patch = 0)
+        val r0_1_0 = HomeServerVersion(major = 0, minor = 1, patch = 0)
+        val r0_2_0 = HomeServerVersion(major = 0, minor = 2, patch = 0)
+        val r0_3_0 = HomeServerVersion(major = 0, minor = 3, patch = 0)
+        val r0_4_0 = HomeServerVersion(major = 0, minor = 4, patch = 0)
+        val r0_5_0 = HomeServerVersion(major = 0, minor = 5, patch = 0)
+        val r0_6_0 = HomeServerVersion(major = 0, minor = 6, patch = 0)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/Versions.kt
index a65be58e54..aee5f7e3f3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/version/Versions.kt
@@ -105,5 +105,5 @@ private fun Versions.getMaxVersion(): HomeServerVersion {
     return supportedVersions
             ?.mapNotNull { HomeServerVersion.parse(it) }
             ?.max()
-            ?: HomeServerVersion.r0_0_1
+            ?: HomeServerVersion.r0_0_0
 }