diff --git a/libnymea-app-core/connection/nymeaconnection.cpp b/libnymea-app-core/connection/nymeaconnection.cpp
index 7a9e9206..120bffc8 100644
--- a/libnymea-app-core/connection/nymeaconnection.cpp
+++ b/libnymea-app-core/connection/nymeaconnection.cpp
@@ -337,7 +337,7 @@ void NymeaConnection::onDisconnected()
         if (!m_currentTransport && m_transportCandidates.isEmpty()) {
             qDebug() << "Last connection dropped.";
             QTimer::singleShot(1000, this, [this](){
-                if (m_currentHost) {
+                if (m_currentHost && m_connectionStatus != ConnectionStatusSslUntrusted) {
                     qDebug() << "Trying to reconnect..";
                     connectInternal(m_currentHost);
                 }
diff --git a/nymea-app/ui/connection/CertificateDialog.qml b/nymea-app/ui/connection/CertificateDialog.qml
index dc1c62dc..0ca054ee 100644
--- a/nymea-app/ui/connection/CertificateDialog.qml
+++ b/nymea-app/ui/connection/CertificateDialog.qml
@@ -107,4 +107,7 @@ Dialog {
     onAccepted: {
         engine.connection.acceptCertificate(certDialog.url, certDialog.pem)
     }
+    onRejected: {
+        engine.connection.disconnect();
+    }
 }