diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp
index fb0ebd4..a07e24c 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp
@@ -59,7 +59,7 @@ TunnelProxyRemoteConnection::~TunnelProxyRemoteConnection()
 
 bool TunnelProxyRemoteConnection::remoteConnected() const
 {
-    return m_remoteConnected;
+    return m_state == StateRemoteConnected;
 }
 
 TunnelProxyRemoteConnection::State TunnelProxyRemoteConnection::state() const
@@ -273,18 +273,9 @@ void TunnelProxyRemoteConnection::setState(State state)
     m_state = state;
     qCDebug(dcTunnelProxyRemoteConnection()) << "State changed" << m_state;
     emit stateChanged(m_state);
-
-    setRemoteConnected(m_state == StateRemoteConnected);
+    emit remoteConnectedChanged(m_state == StateRemoteConnected);
 }
 
-void TunnelProxyRemoteConnection::setRemoteConnected(bool remoteConnected)
-{
-    if (m_remoteConnected == remoteConnected)
-        return;
-
-    m_remoteConnected = remoteConnected;
-    emit remoteConnectedChanged(m_remoteConnected);
-}
 
 void TunnelProxyRemoteConnection::setError(QAbstractSocket::SocketError error)
 {
diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h
index a50f32c..e550ba9 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h
@@ -118,8 +118,6 @@ private:
 
     QUuid m_serverUuid;
 
-    bool m_remoteConnected = false;
-
     // Remote proxy server information
     QString m_remoteProxyServer;
     QString m_remoteProxyServerName;