diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 1f6932094c..a975a86ada 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -761,6 +761,7 @@ void AccountManager::generateNewKeypair(bool isUserKeypair, const QUuid& domainI
                 this, &AccountManager::handleKeypairGenerationError);
 
         connect(keypairGenerator, &QObject::destroyed, generateThread, &QThread::quit);
+        connect(this, &QObject::destroyed, generateThread, &QThread::quit);
         connect(generateThread, &QThread::finished, generateThread, &QThread::deleteLater);
 
         keypairGenerator->moveToThread(generateThread);