diff --git a/libnymea-app/engine.cpp b/libnymea-app/engine.cpp
index b26215cc..6238d55a 100644
--- a/libnymea-app/engine.cpp
+++ b/libnymea-app/engine.cpp
@@ -63,13 +63,20 @@ Engine::Engine(QObject *parent) :
         }
     });
     connect(m_jsonRpcClient, &JsonRpcClient::connectedChanged, this, [this]() {
+        qDebug() << "JSONRpc connected changed:" << m_jsonRpcClient->connected() << "AWS status:" << AWSClient::instance()->awsDevices()->rowCount();
+        if (m_jsonRpcClient->connected() && m_jsonRpcClient->cloudConnectionState() == JsonRpcClient::CloudConnectionStateConnected) {
+            if (AWSClient::instance()->awsDevices()->getDevice(m_jsonRpcClient->serverUuid()) == nullptr) {
+                m_jsonRpcClient->setupRemoteAccess(AWSClient::instance()->idToken(), AWSClient::instance()->userId());
+            }
+        }
+    });
+    connect(m_jsonRpcClient, &JsonRpcClient::cloudConnectionStateChanged, this, [this](){
         if (m_jsonRpcClient->connected() && m_jsonRpcClient->cloudConnectionState() == JsonRpcClient::CloudConnectionStateConnected) {
             if (AWSClient::instance()->awsDevices()->getDevice(m_jsonRpcClient->serverUuid()) == nullptr) {
                 m_jsonRpcClient->setupRemoteAccess(AWSClient::instance()->idToken(), AWSClient::instance()->userId());
             }
         }
     });
-
 }
 
 DeviceManager *Engine::deviceManager() const