diff --git a/app/src/main/kotlin/com/wire/android/feature/AccountSwitchUseCase.kt b/app/src/main/kotlin/com/wire/android/feature/AccountSwitchUseCase.kt
index 17ce4b5dad8..67ec45ab917 100644
--- a/app/src/main/kotlin/com/wire/android/feature/AccountSwitchUseCase.kt
+++ b/app/src/main/kotlin/com/wire/android/feature/AccountSwitchUseCase.kt
@@ -166,6 +166,7 @@ class AccountSwitchUseCase @Inject constructor(
             LogoutReason.SELF_SOFT_LOGOUT, LogoutReason.SELF_HARD_LOGOUT -> {
                 deleteSession(invalidAccount.userId)
             }
+            LogoutReason.MIGRATION_TO_CC_FAILED,
             LogoutReason.DELETED_ACCOUNT,
             LogoutReason.REMOVED_CLIENT,
             LogoutReason.SESSION_EXPIRED -> deleteSession(invalidAccount.userId)
diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
index 12ba8586963..7b8c9199570 100644
--- a/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
@@ -231,7 +231,7 @@ class WireActivityViewModel @Inject constructor(
                     // Self logout is handled from the Self user profile screen directly
                 }
 
-                LogoutReason.REMOVED_CLIENT ->
+                LogoutReason.MIGRATION_TO_CC_FAILED, LogoutReason.REMOVED_CLIENT ->
                     globalAppState = globalAppState.copy(blockUserUI = CurrentSessionErrorState.RemovedClient)
 
                 LogoutReason.DELETED_ACCOUNT ->
diff --git a/default.json b/default.json
index 4936fc005bc..b908e864406 100644
--- a/default.json
+++ b/default.json
@@ -28,7 +28,7 @@
             "default_backend_url_website": "https://wire.com",
             "default_backend_title": "wire-staging",
             "is_password_protected_guest_link_enabled": true,
-            "encrypt_proteus_storage": true
+            "encrypt_proteus_storage": false
         },
         "staging": {
             "application_id": "com.waz.zclient.dev",
diff --git a/kalium b/kalium
index bea029d86e5..c5c24685027 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit bea029d86e57ae0d46d9923595d3ad467c5b8c57
+Subproject commit c5c24685027a629022cabe70750ff62d7edc48ff