diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp
index d8f29006..dbcff307 100644
--- a/YACReaderLibrary/main.cpp
+++ b/YACReaderLibrary/main.cpp
@@ -49,5 +49,11 @@ int main( int argc, char ** argv )
   /*mw->resize(800,480);
   mw->showMaximized();*/
 
-  return app.exec();
+  int ret = app.exec();
+
+  //server shutdown
+  s->stop();
+  delete s;
+
+  return ret;
 }
diff --git a/YACReaderLibrary/server/startup.cpp b/YACReaderLibrary/server/startup.cpp
index b8599dc7..5f33207a 100644
--- a/YACReaderLibrary/server/startup.cpp
+++ b/YACReaderLibrary/server/startup.cpp
@@ -64,7 +64,7 @@ void Startup::start() {
 void Startup::stop() {
     qDebug("ServiceHelper: Service has been stopped");
     // QCoreApplication destroys all objects that have been created in start().
-	listener->close();
+	delete listener;
 }