2 files changed, 10 insertions, 1 deletions

diff --git a/framework/src/accounts/accountsmodel.cpp b/framework/src/accounts/accountsmodel.cpp
index f98e8ca3..8b46f4d3 100644
--- a/framework/src/accounts/accountsmodel.cpp
+++ b/framework/src/accounts/accountsmodel.cpp
@@ -85,7 +85,11 @@ void AccountsModel::runQuery(const Sink::Query &query)
 void AccountsModel::setAccountId(const QByteArray &accountId)
 {
     qWarning() << "Setting account id" << accountId;
-    //Get all folders of an account
+    if (accountId.isEmpty()) {
+        setSourceModel(nullptr);
+        mModel.clear();
+        return;
+    }
     Sink::Query query;
     query.filter(accountId);
     query.setFlags(Query::LiveQuery);
diff --git a/framework/src/domain/folderlistmodel.cpp b/framework/src/domain/folderlistmodel.cpp
index 1ef6f761..3d48ca7e 100644
--- a/framework/src/domain/folderlistmodel.cpp
+++ b/framework/src/domain/folderlistmodel.cpp
@@ -151,6 +151,11 @@ bool FolderListModel::lessThan(const QModelIndex &left, const QModelIndex &right
 void FolderListModel::setFolderId(const QVariant &folderId)
 {
     const auto folder = folderId.toString().toUtf8();
+    if (folder.isEmpty()) {
+        setSourceModel(nullptr);
+        mModel.clear();
+        return;
+    }
 
     //Get all folders of an account
     auto query = Query();