diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index 6fcbd6c70f..66c4e507f6 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -397,7 +397,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
 
 	case NP_MSG_DISABLE_GAME:
 	{
-		PanicAlertT("Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game.");
+		PanicAlertT("Other client disconnected while game is running!! NetPlay is disabled. You must manually stop the game.");
 		std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
 		m_is_running = false;
 		NetPlay_Disable();
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 79acbb6918..1ea6055815 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -334,7 +334,7 @@ unsigned int NetPlayServer::OnDisconnect(Client& player)
 	{
 		for (PadMapping mapping : m_pad_map)
 		{
-			if (mapping == pid)
+			if (mapping == pid && pid != 1)
 			{
 				PanicAlertT("Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game.");
 				std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
@@ -344,7 +344,7 @@ unsigned int NetPlayServer::OnDisconnect(Client& player)
 				spac << (MessageId)NP_MSG_DISABLE_GAME;
 				// this thread doesn't need players lock
 				std::lock_guard<std::recursive_mutex> lks(m_crit.send);
-				SendToClients(spac);
+				SendToClients(spac, 1);
 				break;
 			}
 		}