diff --git a/legacy/mailstore/src/main/java/app/k9mail/legacy/mailstore/FolderRepository.kt b/legacy/mailstore/src/main/java/app/k9mail/legacy/mailstore/FolderRepository.kt
index 7890664586..b2d1f01577 100644
--- a/legacy/mailstore/src/main/java/app/k9mail/legacy/mailstore/FolderRepository.kt
+++ b/legacy/mailstore/src/main/java/app/k9mail/legacy/mailstore/FolderRepository.kt
@@ -91,8 +91,8 @@ class FolderRepository(
             .flowOn(ioDispatcher)
     }
 
-    fun getDisplayFoldersFlow(account: Account): Flow<List<DisplayFolder>> {
-        return accountManager.getAccountFlow(account.uuid)
+    fun getDisplayFoldersFlow(accountUuid: String): Flow<List<DisplayFolder>> {
+        return accountManager.getAccountFlow(accountUuid)
             .map { latestAccount ->
                 AccountContainer(latestAccount, latestAccount.folderDisplayMode)
             }
diff --git a/legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/FoldersViewModel.kt b/legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/FoldersViewModel.kt
index 4aa2711c71..0ff3553d84 100644
--- a/legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/FoldersViewModel.kt
+++ b/legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/FoldersViewModel.kt
@@ -33,7 +33,7 @@ class FoldersViewModel(
             if (account == null) {
                 flowOf(0 to emptyList())
             } else {
-                folderRepository.getDisplayFoldersFlow(account)
+                folderRepository.getDisplayFoldersFlow(account.uuid)
                     .map { displayFolders ->
                         account.accountNumber to displayFolders
                     }
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt
index 822eb00c25..475e00f976 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersViewModel.kt
@@ -9,6 +9,6 @@ import app.k9mail.legacy.mailstore.FolderRepository
 
 class ManageFoldersViewModel(private val folderRepository: FolderRepository) : ViewModel() {
     fun getFolders(account: Account): LiveData<List<DisplayFolder>> {
-        return folderRepository.getDisplayFoldersFlow(account).asLiveData()
+        return folderRepository.getDisplayFoldersFlow(account.uuid).asLiveData()
     }
 }