diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 72a1e2bb247b128e6ff1ec63fc38103cc3e1105e..6d2a9da13a72df2766bcb48625c4607968e42cd2 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -168,6 +168,9 @@ NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, U
 
 NetworkPluginServer::~NetworkPluginServer() {
 	m_pingTimer->stop();
+	m_server->stop();
+	m_server.reset();
+	delete m_component->m_factory;
 	delete m_vcardResponder;
 	delete m_rosterResponder;
 }