diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index 7fbd5b2bf6..dcf4d87894 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -38,8 +38,8 @@ data class HomeDetailViewState(
         val notificationCountRooms: Int = 0,
         val notificationHighlightRooms: Boolean = false,
         val hasUnreadMessages: Boolean = false,
-        val syncState: SyncState = SyncState.Idle,
-        val incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState = SyncRequestState.IncrementalSyncIdle,
+        val syncState: SyncState? = null,
+        val incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState? = null,
         val pushCounter: Int = 0,
         val pstnSupportFlag: Boolean = false,
         val forceDialPadTab: Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 897594ffad..f4919a5906 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -60,8 +60,8 @@ data class RoomDetailViewState(
         val formattedTypingUsers: String? = null,
         val tombstoneEvent: Event? = null,
         val joinUpgradedRoomAsync: Async<String> = Uninitialized,
-        val syncState: SyncState = SyncState.Idle,
-        val incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState = SyncRequestState.IncrementalSyncIdle,
+        val syncState: SyncState? = null,
+        val incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState? = null,
         val pushCounter: Int = 0,
         val highlightedEventId: String? = null,
         val unreadState: UnreadState = UnreadState.Unknown,
diff --git a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
index a71f445859..a40b70b8a6 100755
--- a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
+++ b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
@@ -40,8 +40,8 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
 
     @SuppressLint("SetTextI18n")
     fun render(
-            newState: SyncState,
-            incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState,
+            newState: SyncState?,
+            incrementalSyncRequestState: SyncRequestState.IncrementalSyncRequestState?,
             pushCounter: Int,
             showDebugInfo: Boolean
     ) {
@@ -64,8 +64,9 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
         }
     }
 
-    private fun SyncState.toHumanReadable(): String {
+    private fun SyncState?.toHumanReadable(): String {
         return when (this) {
+            null -> "Unknown"
             SyncState.Idle -> "Idle"
             SyncState.InvalidToken -> "InvalidToken"
             SyncState.Killed -> "Killed"
@@ -76,8 +77,9 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
         }
     }
 
-    private fun SyncRequestState.IncrementalSyncRequestState.toHumanReadable(): String {
+    private fun SyncRequestState.IncrementalSyncRequestState?.toHumanReadable(): String {
         return when (this) {
+            null -> "Unknown"
             SyncRequestState.IncrementalSyncIdle -> "Idle"
             is SyncRequestState.IncrementalSyncParsing -> "Parsing ${this.rooms} room(s) ${this.toDevice} toDevice(s)"
             SyncRequestState.IncrementalSyncError -> "Error"