diff --git a/src/k_grandprix.cpp b/src/k_grandprix.cpp
index 7891306b2..0efcdf9da 100644
--- a/src/k_grandprix.cpp
+++ b/src/k_grandprix.cpp
@@ -60,7 +60,7 @@ INT16 K_CalculateGPRankPoints(UINT16 exp, UINT8 position, UINT8 numplayers)
 {
 	INT16 points;
 
-	if (position >= numplayers || position == 0)
+	if (position > numplayers || position == 0)
 	{
 		// Invalid position, no points
 		return 0;
diff --git a/src/y_inter.cpp b/src/y_inter.cpp
index 00752ce83..cceb14a7e 100644
--- a/src/y_inter.cpp
+++ b/src/y_inter.cpp
@@ -295,8 +295,7 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
 			{
 				UINT8 pointgetters = numplayersingame + spectateGriefed;
 
-				if (data.pos[data.numplayers] < pointgetters
-				&& !(players[i].pflags & PF_NOCONTEST))
+				if (data.pos[data.numplayers] <= pointgetters)
 				{
 					data.increase[i] = K_CalculateGPRankPoints((&players[i])->exp, data.pos[data.numplayers], pointgetters);