diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp
index 252a81b..518931f 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp
@@ -205,6 +205,11 @@ QVariantMap TunnelProxyServer::currentStatistics()
 
     QVariantList tunnelConnections;
     foreach (TunnelProxyServerConnection *serverConnection, m_tunnelProxyServerConnections) {
+
+        // Show only active clients
+        if (serverConnection->clientConnections().isEmpty())
+            continue;
+
         QVariantMap serverMap;
         serverMap.insert("id", serverConnection->transportClient()->clientId().toString());
         serverMap.insert("address", serverConnection->transportClient()->peerAddress().toString());
diff --git a/monitor/terminalwindow.h b/monitor/terminalwindow.h
index 96509e7..42b43f5 100644
--- a/monitor/terminalwindow.h
+++ b/monitor/terminalwindow.h
@@ -58,7 +58,7 @@ private:
     int m_terminalSizeX = 0;
     int m_terminalSizeY = 0;
 
-    View m_view = ViewClients;
+    View m_view = ViewTunnelProxy;
     int m_tunnelProxyScollIndex = 0;