diff --git a/sc2/src/uqm.c b/sc2/src/uqm.c
index 974325e0c..d17ea8491 100644
--- a/sc2/src/uqm.c
+++ b/sc2/src/uqm.c
@@ -916,7 +916,7 @@ parseOptions (int argc, char *argv[], struct options_struct *options)
 				}
 				netplayOptions.inputDelay = temp;
 
-				if (netplayOptions.inputDelay > 60 * BATTLE_FRAME_RATE)
+				if (netplayOptions.inputDelay > BATTLE_FRAME_RATE)
 				{
 					log_add (log_Fatal, "Network input delay is absurdly "
 							"large.");
diff --git a/sc2/src/uqm/netplay/packethandlers.c b/sc2/src/uqm/netplay/packethandlers.c
index 7a4d46ec7..ad39c1bdd 100644
--- a/sc2/src/uqm/netplay/packethandlers.c
+++ b/sc2/src/uqm/netplay/packethandlers.c
@@ -487,12 +487,12 @@ PacketHandler_InputDelay(NetConnection *conn,
 
 	battleStateData = (BattleStateData *) NetConnection_getStateData(conn);
 	delay = ntoh32(packet->delay);
-	if (delay > 60 * BATTLE_FRAME_RATE) {
+	if (delay > BATTLE_FRAME_RATE) {
 		log_add(log_Error, "NETPLAY: [%d]     Received absurdly large "
 				"input delay value (%d).", conn->player, delay);
 		return -1;
 	}
-	conn->stateFlags.inputDelay = ntoh32(packet->delay);
+	conn->stateFlags.inputDelay = delay;
 	
 	return 0;
 }