diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
index ea392e97c1..8ca0da0d21 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
@@ -158,9 +158,7 @@ fun MainScreen() {
       showChatDatabaseError -> {
         // Prevent showing keyboard on Android when: passcode enabled and database password not saved
         if (!unauthorized.value && chatModel.chatDbStatus.value != null) {
-          CompositionLocalProvider(LocalAppBarHandler provides remember { AppBarHandler() }) {
-            DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
-          }
+          DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
         }
       }
       remember { chatModel.chatDbEncrypted }.value == null || localUserCreated == null -> SplashView()
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt
index 87aebe4e38..9264ca69af 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt
@@ -77,7 +77,7 @@ fun DatabaseErrorView(
     Text(String.format(generalGetString(MR.strings.database_migrations), ms.joinToString(", ")))
   }
 
-  ColumnWithScrollBar(verticalArrangement = Arrangement.Center) {
+  ColumnWithScrollBarNoAppBar(Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center) {
     val buttonEnabled = validKey(dbKey.value) && !progressIndicator.value
     when (val status = chatDbStatus.value) {
       is DBMigrationResult.ErrorNotADatabase ->