diff --git a/libnymea-app-core/connection/awsclient.cpp b/libnymea-app-core/connection/awsclient.cpp
index 7c5da742..aadb90c0 100644
--- a/libnymea-app-core/connection/awsclient.cpp
+++ b/libnymea-app-core/connection/awsclient.cpp
@@ -156,6 +156,10 @@ bool AWSClient::confirmationPending() const
 
 void AWSClient::login(const QString &username, const QString &password)
 {
+    if (m_usedConfig.isEmpty()) {
+        qDebug() << "AWS config not set. Not logging in.";
+        return;
+    }
     if (m_loginInProgress) {
         qWarning() << "Login already pending...";
         return;
@@ -195,7 +199,7 @@ void AWSClient::login(const QString &username, const QString &password)
     QJsonDocument jsonDoc = QJsonDocument::fromVariant(params);
     QByteArray payload = jsonDoc.toJson(QJsonDocument::Compact);
 
-    qDebug() << "Logging in to AWS as user:" << username;
+    qDebug() << "Logging in to AWS as user:" << username << "with config" << m_usedConfig;
 
     QNetworkReply *reply = m_nam->post(request, payload);
     connect(reply, &QNetworkReply::finished, this, [this, reply, username, password]() {
diff --git a/libnymea-app-core/connection/awsclient.h b/libnymea-app-core/connection/awsclient.h
index 5a52efa3..13296795 100644
--- a/libnymea-app-core/connection/awsclient.h
+++ b/libnymea-app-core/connection/awsclient.h
@@ -215,7 +215,7 @@ private:
     QList<QueuedCall> m_callQueue;
 
     QHash<QString, AWSConfiguration> m_configs;
-    QString m_usedConfig = "Community";
+    QString m_usedConfig = "";
     AWSDevices *m_devices;
 };
 
diff --git a/libnymea-app-core/connection/discovery/nymeadiscovery.cpp b/libnymea-app-core/connection/discovery/nymeadiscovery.cpp
index f7fe2471..e4c8716b 100644
--- a/libnymea-app-core/connection/discovery/nymeadiscovery.cpp
+++ b/libnymea-app-core/connection/discovery/nymeadiscovery.cpp
@@ -107,7 +107,6 @@ void NymeaDiscovery::setAwsClient(AWSClient *awsClient)
     }
 
     if (m_awsClient) {
-        m_awsClient->fetchDevices();
         connect(m_awsClient, &AWSClient::devicesFetched, this, &NymeaDiscovery::syncCloudDevices);
     }
 }
diff --git a/libnymea-app-core/connection/nymeaconnection.cpp b/libnymea-app-core/connection/nymeaconnection.cpp
index b53c05a8..38203760 100644
--- a/libnymea-app-core/connection/nymeaconnection.cpp
+++ b/libnymea-app-core/connection/nymeaconnection.cpp
@@ -136,8 +136,8 @@ Connection *NymeaConnection::currentConnection() const
 
 void NymeaConnection::sendData(const QByteArray &data)
 {
+//    qDebug() << "sending data:" << data;
     if (connected()) {
-//        qDebug() << "sending data:" << data;
         m_currentTransport->sendData(data);
     } else {
         qWarning() << "Connection: Not connected. Cannot send.";
@@ -629,6 +629,8 @@ bool NymeaConnection::isConnectionBearerAvailable(Connection::BearerType connect
         return true;
     case Connection::BearerTypeNone:
         return false;
+    case Connection::BearerTypeLoopback:
+        return true;
     }
     return false;
 }
diff --git a/libnymea-app-core/jsonrpc/jsonrpcclient.cpp b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp
index c73a5844..f222937e 100644
--- a/libnymea-app-core/jsonrpc/jsonrpcclient.cpp
+++ b/libnymea-app-core/jsonrpc/jsonrpcclient.cpp
@@ -310,6 +310,10 @@ void JsonRpcClient::setNotificationsEnabled()
         namespaces.append(nameSpace);
     }
 
+    if (!m_connection->connected()) {
+        return;
+    }
+
     QVariantMap params;
 
     if (ensureServerVersion("3.1")) {