diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index b850e93e..03b0fc89 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -3663,11 +3663,13 @@ void mainWindowImpl::quitPokerTH() {
 
 		if (msgBox.exec() == QMessageBox::Yes ) {
 			mySession->terminateNetworkClient();
+			stopTimer();
 			if (myServerGuiInterface.get()) myServerGuiInterface->getSession().terminateNetworkServer();
 			qApp->quit();
-		}		
+		}
 	}
-	else { 
+	else {
+		mySession->terminateNetworkClient();
 		stopTimer();
 		qApp->quit();
 	}