diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt
index 0dfcee7196..7439f016d8 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt
@@ -23,13 +23,13 @@ class SteadyStateExceptionMapper {
     fun map(data: RustSteadyStateException): SteadyStateException {
         return when (data) {
             is RustSteadyStateException.BackupDisabled -> SteadyStateException.BackupDisabled(
-                message = data.message
+                message = data.message.orEmpty()
             )
             is RustSteadyStateException.Connection -> SteadyStateException.Connection(
-                message = data.message
+                message = data.message.orEmpty()
             )
             is RustSteadyStateException.Lagged -> SteadyStateException.Lagged(
-                message = data.message
+                message = data.message.orEmpty()
             )
         }
     }