diff --git a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp
index 5284f7db59..efd32f2b45 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorServerUnitTests.cpp
@@ -45,7 +45,10 @@ AssetProcessorServerUnitTest::AssetProcessorServerUnitTest()
     connect(m_applicationServer.get(), SIGNAL(newIncomingConnection(qintptr)), m_connectionManager, SLOT(NewConnection(qintptr)));
 }
 
-AssetProcessorServerUnitTest::~AssetProcessorServerUnitTest() = default;
+AssetProcessorServerUnitTest::~AssetProcessorServerUnitTest()
+{
+    disconnect();
+}
 
 void AssetProcessorServerUnitTest::AssetProcessorServerTest()
 {
diff --git a/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp
index e7ebc030e6..7e0cdd7b3d 100644
--- a/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/BatchApplicationServer.cpp
@@ -16,6 +16,7 @@ BatchApplicationServer::BatchApplicationServer(QObject* parent)
 
 BatchApplicationServer::~BatchApplicationServer()
 {
+    close();
 }
 
 bool BatchApplicationServer::startListening(unsigned short port)