diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index b2791c0978..303433db67 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -108,7 +108,7 @@ class AppStateHandler @Inject constructor(
                 }
                 .distinctUntilChanged()
                 .subscribe {
-                    val overrideColorSpecs = it?.first()?.content?.toModel<Map<String, String>>()
+                    val overrideColorSpecs = it?.firstOrNull()?.content?.toModel<Map<String, String>>()
                     matrixItemColorProvider.setOverrideColors(overrideColorSpecs)
                 }
                 .addTo(compositeDisposable)