diff --git a/src/f_finale.c b/src/f_finale.c
index b5367bc0..046a55e5 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1034,14 +1034,17 @@ void F_TitleScreenTicker(boolean run)
 		numstaff = 1;
 		while (numstaff < 100 && (l = W_CheckNumForName(va("%sS%02u",mapname,numstaff+1))) != LUMPERROR)
 			numstaff++;
-		if (laststaff && laststaff <= numstaff && numstaff > 1) // don't do the same staff member twice in a row, even if they're on different maps
+		if (numstaff > 1)
 		{
-			numstaff = M_RandomKey(numstaff-1)+1;
-			if (numstaff >= laststaff)
-				numstaff++;
+			if (laststaff && laststaff <= numstaff) // don't do the same staff member twice in a row, even if they're on different maps
+			{
+				numstaff = M_RandomKey(numstaff-1)+1;
+				if (numstaff >= laststaff)
+					numstaff++;
+			}
+			else
+				numstaff = M_RandomKey(numstaff)+1;
 		}
-		else
-			numstaff = M_RandomKey(numstaff)+1;
 
 		laststaff = numstaff;