diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index e661b2de1..83aef5447 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -5353,6 +5353,7 @@ static void HandlePacketFromPlayer(SINT8 node)
 					}
 				}
 			}
+			expectChallenge = false;
 			break;
 		default:
 			DEBFILE(va("UNKNOWN PACKET TYPE RECEIVED %d from host %d\n",
diff --git a/src/p_tick.c b/src/p_tick.c
index 6ad4caf8c..3ce65d79a 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -974,7 +974,7 @@ void P_Ticker(boolean run)
 	if (leveltime <= CHALLENGEALL_START && client)
 		expectChallenge = true;
 
-	if (leveltime >= CHALLENGEALL_CLIENTCUTOFF && client)
+	if (leveltime > CHALLENGEALL_CLIENTCUTOFF && expectChallenge && client)
 	{
 		HandleSigfail("Didn't receive client signatures.");
 		return;