diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 22e24b823..812de6e5d 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1856,7 +1856,7 @@ Command_Invite_f (void)
 		return;
 	}
 
-	if (r_splitscreen >= MAXSPLITSCREENPLAYERS)
+	if (G_PartySize(consoleplayer) >= MAXSPLITSCREENPLAYERS)
 	{
 		CONS_Alert(CONS_WARNING, "Your party is full!\n");
 		return;
@@ -1983,7 +1983,7 @@ Command_RejectInvite_f (void)
 static void
 Command_LeaveParty_f (void)
 {
-	if (r_splitscreen > splitscreen)
+	if (G_PartySize(consoleplayer) > G_LocalSplitscreenPartySize(consoleplayer))
 	{
 		CONS_Printf("\x85Leaving party...\n");
 
diff --git a/src/g_party.cpp b/src/g_party.cpp
index 0caad76b7..bb55c36d8 100644
--- a/src/g_party.cpp
+++ b/src/g_party.cpp
@@ -128,16 +128,15 @@ public:
 			return;
 		}
 
-		// Rendering stuff is not valid outside of levels.
-		if (!G_GamestateUsesLevel())
-		{
-			return;
-		}
-
 		for (std::size_t i = 0; i < size(); ++i)
 		{
 			displayplayers[i] = at(i);
-			G_FixCamera(1 + i);
+
+			// Camera is not valid outside of levels.
+			if (G_GamestateUsesLevel())
+			{
+				G_FixCamera(1 + i);
+			}
 		}
 
 		r_splitscreen = size() - 1;