diff --git a/base/tlsclient.cpp b/base/tlsclient.cpp
index aa90f4119..726922e18 100644
--- a/base/tlsclient.cpp
+++ b/base/tlsclient.cpp
@@ -56,6 +56,8 @@ void TLSClient::Start(void)
 		SSL_set_accept_state(m_SSL.get());
 	else
 		SSL_set_connect_state(m_SSL.get());
+
+	SSL_do_handshake(m_SSL.get());
 }
 
 int TLSClient::ReadableEventHandler(const EventArgs& ea)
diff --git a/icinga-app/icinga.conf b/icinga-app/icinga.conf
index daf2922c9..506429da3 100644
--- a/icinga-app/icinga.conf
+++ b/icinga-app/icinga.conf
@@ -16,9 +16,6 @@
 	"rpclistener": {
 		"kekslistener": { "replicate": "0", "port": "7777" }
 	},
-	"rpcconnection": {
-		"foo": { "replicate": "0", "hostname": "10.0.10.3", "port": "7777" }
-	},
 	"host": {
 		"localhost": { "ipaddr": "127.0.0.1" }
 	}