diff --git a/app/server.cpp b/app/server.cpp
index bb9c9fb..de51f83 100644
--- a/app/server.cpp
+++ b/app/server.cpp
@@ -44,6 +44,17 @@ void Server::update()
         clients[i]->sendFull(clients, i);
 }
 
+Server::~Server()
+{
+    if(server->isListening())
+        server->close();
+    server->deleteLater();
+    timer->stop();
+    delete timer;
+    for(int i=0; i<clients.size(); ++i)
+        delete clients[i];
+}
+
 void Server::on_newConnection()
 {
     QTcpSocket* socket = server->nextPendingConnection();
@@ -79,7 +90,11 @@ Client::Client(QTcpSocket* mySocket)
 Client::~Client()
 {
     if(socket != NULL)
+    {
+        if(socket->isOpen())
+            socket->close();
         socket->deleteLater();
+    }
 }
 
 void Client::on_readyRead()
diff --git a/app/server.h b/app/server.h
index 5d6775a..de249fa 100644
--- a/app/server.h
+++ b/app/server.h
@@ -15,6 +15,7 @@ class Server : public QObject
     Q_OBJECT
 public:
     explicit Server(unsigned short port = 20202, QObject *parent = 0);
+    ~Server();
     QTcpServer* server;
     QTimer* timer;
     std::vector<Client*> clients;