diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI_DeviceGecko.cpp
index 95b40141a4..365468a6d8 100644
--- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp
+++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp
@@ -23,10 +23,12 @@ GeckoSockServer::GeckoSockServer()
 GeckoSockServer::~GeckoSockServer()
 {
 	if (clientThread.joinable())
+	{
 		--client_count;
 
-	client_running = false;
-	clientThread.join();
+		client_running = false;
+		clientThread.join();
+	}
 
 	if (client_count <= 0)
 	{