diff --git a/src/d_net.c b/src/d_net.c
index 8f11f60fcaf048f3a97add81df27dca4b7fe059e..68720f5ee54f7f9baa0903342d51eb7df3523b3e 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -1124,27 +1124,22 @@ boolean HGetPacket(void)
 	// Get a packet from self
 	if (rebound_tail != rebound_head)
 	{
-		while (true) // loop until we found a valid packet, or we ran out of packets
-		{ // provided MAXREBOUND is not all that large this shouldn't take too long
-			if (rebound_tail == rebound_head)
-				break; // just give up, none of them were any good somehow
-			M_Memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
-			doomcom->datalength = reboundsize[rebound_tail];
-			if (netbuffer->packettype == PT_NODETIMEOUT)
-				doomcom->remotenode = netbuffer->u.textcmd[0];
-			else
-				doomcom->remotenode = 0;
+		M_Memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
+		doomcom->datalength = reboundsize[rebound_tail];
+		if (netbuffer->packettype == PT_NODETIMEOUT)
+			doomcom->remotenode = netbuffer->u.textcmd[0];
+		else
+			doomcom->remotenode = 0;
 
-			rebound_tail = (rebound_tail+1) % MAXREBOUND;
+		rebound_tail = (rebound_tail+1) % MAXREBOUND;
 
-			if (doomcom->remotenode == -1) // wait hang on what?
-				continue; // ignore it, look for the next packet
+		if (doomcom->remotenode == -1) // wait hang on what?
+			return true; // there might still be packets from others though, so don't return false
 #ifdef DEBUGFILE
-			if (debugfile)
-				DebugPrintpacket("GETLOCAL");
+		if (debugfile)
+			DebugPrintpacket("GETLOCAL");
 #endif
-			return true;
-		}
+		return true;
 	}
 
 	if (!netgame)