diff --git a/src/main.cpp b/src/main.cpp
index b3c0112..0af8ec5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,7 +55,8 @@ ON_APPLICATION_START() {
     nn::ac::GetAssignedAddress(&hostIpAddress);
     initLogging();
 
-
+    //Make sure the server instance is destroyed.
+    BackgroundThread::destroyInstance();
     if (gFTPServerEnabled) {
         startServer();
     }
@@ -225,6 +226,5 @@ WUPS_CONFIG_CLOSED() {
 
 ON_APPLICATION_REQUESTS_EXIT() {
     stopServer();
-
     deinitLogging();
 }