diff --git a/src/app/FTPServer.h b/src/app/FTPServer.h
index 46f6a2e..6257351 100644
--- a/src/app/FTPServer.h
+++ b/src/app/FTPServer.h
@@ -52,9 +52,19 @@ class FTPServer : public TCPServer<T>
 
     virtual ~FTPServer()
     {
+      _dataServer.stop();
       free(_login); free(_password);
     }
 
+    virtual void stop()
+    {
+      if(TCPServer<T>::_serverStarted)
+      {
+        _dataServer.stop();
+        TCPServer<T>::stop();
+      }
+    }
+
   protected:
     virtual T* createNewClient(WiFiClient wc)
     {