Index: binaries/data/mods/public/gui/gamesetup/NetMessages/NetMessages.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/NetMessages/NetMessages.js
+++ binaries/data/mods/public/gui/gamesetup/NetMessages/NetMessages.js
@@ -35,8 +35,6 @@
 			if (!message)
 				break;
 
-			log("Net message: " + uneval(message));
-
 			if (this.netMessageHandlers[message.type])
 				for (let handler of this.netMessageHandlers[message.type])
 					handler(message);
Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
+++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
@@ -190,7 +190,6 @@
 		if (!message)
 			break;
 
-		log(sprintf(translate("Net message: %(message)s"), { "message": uneval(message) }));
 		// If we're rejoining an active game, we don't want to actually display
 		// the game setup screen, so perform similar processing to gamesetup.js
 		// in this screen
@@ -350,7 +349,7 @@
 	Engine.ConfigDB_CreateValue("user", "playername.multiplayer", playername);
 	Engine.ConfigDB_CreateValue("user", "multiplayerhosting.port", port);
 	Engine.ConfigDB_SaveChanges("user");
-	
+
 	let hostFeedback = Engine.GetGUIObjectByName("hostFeedback");
 
 	// Disallow identically named games in the multiplayer lobby
Index: binaries/data/mods/public/gui/session/messages.js
===================================================================
--- binaries/data/mods/public/gui/session/messages.js
+++ binaries/data/mods/public/gui/session/messages.js
@@ -433,8 +433,6 @@
 		if (!msg)
 			return;
 
-		log("Net message: " + uneval(msg));
-
 		if (g_NetMessageTypes[msg.type])
 			g_NetMessageTypes[msg.type](msg);
 		else
Index: source/network/NetClient.cpp
===================================================================
--- source/network/NetClient.cpp
+++ source/network/NetClient.cpp
@@ -300,7 +300,7 @@
 		port = enetClient->address.port;
 	}
 
-	LOGMESSAGE("NetClient: connecting to server at %s:%i", m_ServerAddress, m_ServerPort);
+	LOGMESSAGEDEBUG("NetClient: connecting to server at %s:%i", m_ServerAddress, m_ServerPort);
 
 	if (!ip.empty())
 	{
Index: source/network/NetHost.cpp
===================================================================
--- source/network/NetHost.cpp
+++ source/network/NetHost.cpp
@@ -20,6 +20,7 @@
 #include "NetHost.h"
 
 #include "lib/external_libraries/enet.h"
+#include "lib/code_annotation.h"
 #include "network/NetMessage.h"
 #include "ps/CLogger.h"
 
@@ -29,7 +30,11 @@
 	if (!packet)
 		return false;
 
+#ifdef NDEBUG
+	UNUSED2(peerName);
+#elif
 	LOGMESSAGE("Net: Sending message %s of size %lu to %s", message->ToString().c_str(), (unsigned long)packet->dataLength, peerName);
+#endif
 
 	// Let ENet send the message to peer
 	if (enet_peer_send(peer, DEFAULT_CHANNEL, packet) < 0)
Index: source/network/NetServer.cpp
===================================================================
--- source/network/NetServer.cpp
+++ source/network/NetServer.cpp
@@ -339,14 +339,14 @@
 		freeUPnP();
 		return;
 	}
-	LOGMESSAGE("Net server: ExternalIPAddress = %s", externalIPAddress);
+	LOGMESSAGEDEBUG("Net server: ExternalIPAddress = %s", externalIPAddress);
 
 	// Try to setup port forwarding.
 	ret = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, psPort, psPort,
 							internalIPAddress, description, protocall, 0, leaseDuration);
 	if (ret != UPNPCOMMAND_SUCCESS)
 	{
-		LOGMESSAGE("Net server: AddPortMapping(%s, %s, %s) failed with code %d (%s)",
+		LOGMESSAGEDEBUG("Net server: AddPortMapping(%s, %s, %s) failed with code %d (%s)",
 			   psPort, psPort, internalIPAddress, ret, strupnperror(ret));
 		freeUPnP();
 		return;
@@ -369,7 +369,7 @@
 		return;
 	}
 
-	LOGMESSAGE("Net server: External %s:%s %s is redirected to internal %s:%s (duration=%s)",
+	LOGMESSAGEDEBUG("Net server: External %s:%s %s is redirected to internal %s:%s (duration=%s)",
 				   externalIPAddress, psPort, protocall, intClient, intPort, duration);
 
 	// Cache root descriptor URL to try to avoid discovery next time.
@@ -520,7 +520,7 @@
 		// Report the client address
 		char hostname[256] = "(error)";
 		enet_address_get_host_ip(&event.peer->address, hostname, ARRAY_SIZE(hostname));
-		LOGMESSAGE("Net server: Received connection from %s:%u", hostname, (unsigned int)event.peer->address.port);
+		LOGMESSAGEDEBUG("Net server: Received connection from %s:%u", hostname, (unsigned int)event.peer->address.port);
 
 		// Set up a session object for this peer
 
@@ -574,7 +574,7 @@
 			CNetMessage* msg = CNetMessageFactory::CreateMessage(event.packet->data, event.packet->dataLength, GetScriptInterface());
 			if (msg)
 			{
-				LOGMESSAGE("Net server: Received message %s of size %lu from %s", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength(), DebugName(session).c_str());
+				LOGMESSAGEDEBUG("Net server: Received message %s of size %lu from %s", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength(), DebugName(session).c_str());
 
 				HandleMessageReceive(msg, session);
 
Index: source/network/NetSession.cpp
===================================================================
--- source/network/NetSession.cpp
+++ source/network/NetSession.cpp
@@ -133,7 +133,7 @@
 		// Report the server address immediately.
 		char hostname[256] = "(error)";
 		enet_address_get_host_ip(&event.peer->address, hostname, ARRAY_SIZE(hostname));
-		LOGMESSAGE("Net client: Connected to %s:%u", hostname, (unsigned int)event.peer->address.port);
+		LOGMESSAGEDEBUG("Net client: Connected to %s:%u", hostname, (unsigned int)event.peer->address.port);
 		m_Connected = true;
 
 		m_IncomingMessages.push(event);
@@ -186,7 +186,7 @@
 			CNetMessage* msg = CNetMessageFactory::CreateMessage(event.packet->data, event.packet->dataLength, m_Client.GetScriptInterface());
 			if (msg)
 			{
-				LOGMESSAGE("Net client: Received message %s of size %lu from server", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength());
+				LOGMESSAGEDEBUG("Net client: Received message %s of size %lu from server", msg->ToString().c_str(), (unsigned long)msg->GetSerializedLength());
 
 				m_Client.HandleMessage(msg);
 			}
Index: source/ps/CLogger.h
===================================================================
--- source/ps/CLogger.h
+++ source/ps/CLogger.h
@@ -34,7 +34,13 @@
 #define LOGMESSAGERENDER(...) g_Logger->WriteMessage(fmt::sprintf(__VA_ARGS__).c_str(), true)
 #define LOGWARNING(...)       g_Logger->WriteWarning(fmt::sprintf(__VA_ARGS__).c_str())
 #define LOGERROR(...)         g_Logger->WriteError  (fmt::sprintf(__VA_ARGS__).c_str())
+#ifdef NDEBUG
+#define LOGMESSAGEDEBUG(...)      
+#else
+#define LOGMESSAGEDEBUG(...)       LOGMESSAGE(__VA_ARGS__)
+#endif
 
+
 /**
  * Error/warning/message logging class.
  *