diff --git a/lib/netplay/netplay.c b/lib/netplay/netplay.c
index 7e3317e35..737bd48ea 100644
--- a/lib/netplay/netplay.c
+++ b/lib/netplay/netplay.c
@@ -97,9 +97,6 @@ typedef struct
 	unsigned int	bytes;
 } NETBUFSOCKET;
 
-/// This is the hardcoded dpid (player ID) value for the hosting player.
-#define HOST_DPID 1
-
 #define PLAYER_HOST		1
 
 // ////////////////////////////////////////////////////////////////////////
diff --git a/lib/netplay/netplay.h b/lib/netplay/netplay.h
index 9f76a118e..581dd7b0b 100644
--- a/lib/netplay/netplay.h
+++ b/lib/netplay/netplay.h
@@ -157,6 +157,9 @@ typedef struct {
 	uint32_t        bHost;				// true if we are hosting the session
 } NETPLAY;
 
+/// This is the hardcoded dpid (player ID) value for the hosting player.
+#define HOST_DPID 1
+
 // ////////////////////////////////////////////////////////////////////////
 // variables
 
diff --git a/src/multiplay.c b/src/multiplay.c
index c73e4284c..3ed06c9c6 100644
--- a/src/multiplay.c
+++ b/src/multiplay.c
@@ -487,7 +487,6 @@ BOOL isHumanPlayer(UDWORD player)
 UDWORD  whosResponsible(UDWORD player)
 {
 	UDWORD c;
-	SDWORD i;
 
     c = ANYPLAYER;
 	if (isHumanPlayer(player))
@@ -502,26 +501,16 @@ UDWORD  whosResponsible(UDWORD player)
 
 	else
 	{
-		// crawl down array to find a responsible fellow,
-		for(i=player; i>=0; i--)
-		{
-			if(isHumanPlayer(i))
-			{
-				c = i;
-			}
-		}
-		// else crawl up to find a responsible fellow
-		if(c == ANYPLAYER)
-		{
-			for(i=player; i<MAX_PLAYERS; i++)
-			{
-				if(isHumanPlayer(i))
-				{
-					c = i;
-				}
-			}
-		}
+		SDWORD player;
 
+		// find the host using HOST_DPID
+		for(player=0;player <= MAX_PLAYERS && c == ANYPLAYER;player++)
+		{
+			if(player2dpid[player] == HOST_DPID)
+			{
+				c = player;
+			}
+		}
 	}
 	if(c == ANYPLAYER)
 	{