diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 16b850a4b..e4e19d259 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1991,7 +1991,8 @@ static void SendAskInfo(INT32 node)
 	// our address to the host, it'll be able to speak to us.
 	HSendPacket(node, false, 0, sizeof (askinfo_pak));
 
-	I_NetRequestHolePunch();
+	if (node != 0 && node != BROADCASTADDR)
+		I_NetRequestHolePunch();
 }
 
 serverelem_t serverlist[MAXSERVERLIST];
@@ -6145,7 +6146,7 @@ void NetKeepAlive(void)
 	MasterClient_Ticker();
 #endif
 
-	if (serverrunning)
+	if (netgame && serverrunning)
 	{
 		RenewHolePunch();
 	}
@@ -6209,7 +6210,7 @@ void NetUpdate(void)
 	MasterClient_Ticker(); // Acking the Master Server
 #endif
 
-	if (serverrunning)
+	if (netgame && serverrunning)
 	{
 		RenewHolePunch();
 	}