1 files changed, 7 insertions, 5 deletions

diff --git a/framework/src/accounts/accountfactory.cpp b/framework/src/accounts/accountfactory.cpp
index 9dbb402b..c7f3855b 100644
--- a/framework/src/accounts/accountfactory.cpp
+++ b/framework/src/accounts/accountfactory.cpp
@@ -43,11 +43,13 @@ QString AccountFactory::name() const
 void AccountFactory::setAccountId(const QString &accountId)
 {
     mAccountId = accountId;
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query().filter(accountId.toUtf8()))
-        .then([this](const Sink::ApplicationDomain::SinkAccount &account) {
-            mAccountType = account.getProperty("type").toByteArray();
-            loadPackage();
-        }).exec();
+    if (!accountId.isEmpty()) {
+        Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query().filter(accountId.toUtf8()))
+            .then([this](const Sink::ApplicationDomain::SinkAccount &account) {
+                mAccountType = account.getProperty("type").toByteArray();
+                loadPackage();
+            }).exec();
+    }
 }
 
 void AccountFactory::setAccountType(const QString &type)