diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 643c1828a..b9b40385f 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -2426,7 +2426,15 @@ static void HU_DrawRankings(void)
 		V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, gametypes[gametype]->name);
 
 	// Left hand side
-	if (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE)
+	const boolean roundqueueinaction = (roundqueue.position > 0 && roundqueue.position <= roundqueue.size);
+
+	if (roundqueueinaction
+		&& roundqueue.entries[roundqueue.position-1].overridden == true)
+	{
+		V_DrawCenteredString(64, 8, 0, "ROUND");
+		V_DrawCenteredString(64, 16, hilicol, "???");
+	}
+	else if (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE)
 	{
 		const char *roundstr = NULL;
 		V_DrawCenteredString(64, 8, 0, "ROUND");
@@ -2441,7 +2449,7 @@ static void HU_DrawRankings(void)
 		}
 		V_DrawCenteredString(64, 16, hilicol, roundstr);
 	}
-	else if (roundqueue.size > 0)
+	else if (roundqueueinaction)
 	{
 		V_DrawCenteredString(64, 8, 0, "ROUND");
 		V_DrawCenteredString(64, 16, hilicol, va("%d", roundqueue.roundnum));
diff --git a/src/m_cond.c b/src/m_cond.c
index b8ef09890..a3733f899 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -2421,6 +2421,8 @@ static const char *M_GetConditionString(condition_t *cn)
 
 			if (cn->type == UC_ALLCHAOS)
 				chaostext = "7 Chaos";
+			else if (M_CupSecondRowLocked() == true)
+				return NULL;
 			else if (cn->type == UC_ALLSUPER)
 				chaostext = "7 Super";
 			else