diff --git a/include/libqmatrixclient b/include/libqmatrixclient
index f9dccac..52081fe 160000
--- a/include/libqmatrixclient
+++ b/include/libqmatrixclient
@@ -1 +1 @@
-Subproject commit f9dccac588f2aa1c809018c0c5eb606a1470d2c5
+Subproject commit 52081fe91724e5f2a82c55f0e6230d8841dd859a
diff --git a/qtquickcontrols2.conf b/qtquickcontrols2.conf
index ef76765..43179ef 100644
--- a/qtquickcontrols2.conf
+++ b/qtquickcontrols2.conf
@@ -11,4 +11,4 @@ Primary=#344955
 Accent=#673AB7
 ;Foreground=#1D333E
 ;Background=#161616
-Font/Family=Roboto
+Font/Family="Roboto,Noto Color Emoji"
diff --git a/src/controller.cpp b/src/controller.cpp
index 9ca954c..c53df3b 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -42,7 +42,6 @@ Controller::Controller(QObject* parent)
 
 Controller::~Controller() {
   for (Connection* c : m_connections) {
-    c->saveState();
     c->stopSync();
   }
 }
@@ -78,10 +77,9 @@ void Controller::loginWithCredentials(QString serverAddr, QString user,
             [=](QString error, QString, int, int) {
               emit errorOccured("Network Error", error);
             });
-    connect(conn, &Connection::loginError,
-            [=](QString error, QString) {
-              emit errorOccured("Login Failed", error);
-            });
+    connect(conn, &Connection::loginError, [=](QString error, QString) {
+      emit errorOccured("Login Failed", error);
+    });
   }
 }
 
@@ -114,9 +112,7 @@ void Controller::addConnection(Connection* c) {
   connect(c, &Connection::syncDone, this, [=] {
     emit syncDone();
     c->sync(30000);
-
-    static int counter = 0;
-    if (++counter % 17 == 2) c->saveState();
+    c->saveState();
   });
   connect(c, &Connection::loggedOut, this, [=] { dropConnection(c); });
 
@@ -149,10 +145,9 @@ void Controller::invokeLogin() {
         c->loadState();
         addConnection(c);
       });
-      connect(c, &Connection::loginError,
-              [=](QString error, QString) {
-                emit errorOccured("Login Failed", error);
-              });
+      connect(c, &Connection::loginError, [=](QString error, QString) {
+        emit errorOccured("Login Failed", error);
+      });
       connect(c, &Connection::networkError,
               [=](QString error, QString, int, int) {
                 emit errorOccured("Network Error", error);