diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index 86801fb760..451ae061c3 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -181,6 +181,12 @@ void __NetAdhocInit() {
 	actionAfterMatchingMipsCall = __KernelRegisterActionType(AfterMatchingMipsCall::Create);
 	eventAdhocctlHandlerUpdate = CoreTiming::RegisterEvent("AdhocctlHandlerUpdateEvent", __handlerAdhocctlUpdateCallback);
 	eventMatchingHandlerUpdate = CoreTiming::RegisterEvent("MatchingHandlerUpdateEvent", __handlerMatchingUpdateCallback);
+	// Create built-in AdhocServer Thread
+	if (g_Config.bEnableWlan && g_Config.bEnableAdhocServer) {
+		//_status = 1;
+		adhocServerRunning = true;
+		adhocServerThread = std::thread(proAdhocServerThread, SERVER_PORT);
+	}
 }
 
 u32 sceNetAdhocInit() {
@@ -203,13 +209,6 @@ u32 sceNetAdhocInit() {
 			__KernelStartThread(threadAdhocID, 0, 0);
 		}
 
-		// Create built-in AdhocServer Thread
-		if (g_Config.bEnableWlan && g_Config.bEnableAdhocServer) {
-			//_status = 1;
-			adhocServerRunning = true;
-			adhocServerThread = std::thread(proAdhocServerThread, SERVER_PORT);
-		}
-
 		// Return Success
 		return 0;
 	}