diff --git a/src/b_game.cpp b/src/b_game.cpp
index e136f3f29b..5f852d043d 100644
--- a/src/b_game.cpp
+++ b/src/b_game.cpp
@@ -423,8 +423,8 @@ void FCajunMaster::RemoveAllBots (bool fromlist)
 					}
 				}
 			}
+			FBehavior::StaticStartTypedScripts (SCRIPT_Disconnect, players[i].mo, true, i, true);
 			ClearPlayer (i, !fromlist);
-			FBehavior::StaticStartTypedScripts (SCRIPT_Disconnect, NULL, true, i);
 		}
 	}
 
diff --git a/src/g_game.cpp b/src/g_game.cpp
index 8101ca23d2..64e746cefb 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -1713,6 +1713,8 @@ void G_DoPlayerPop(int playernum)
 
 	// [RH] Make the player disappear
 	FBehavior::StaticStopMyScripts(players[playernum].mo);
+	// [RH] Let the scripts know the player left
+	FBehavior::StaticStartTypedScripts(SCRIPT_Disconnect, players[playernum].mo, true, playernum, true);
 	if (players[playernum].mo != NULL)
 	{
 		P_DisconnectEffect(players[playernum].mo);
@@ -1726,8 +1728,6 @@ void G_DoPlayerPop(int playernum)
 		players[playernum].mo = NULL;
 		players[playernum].camera = NULL;
 	}
-	// [RH] Let the scripts know the player left
-	FBehavior::StaticStartTypedScripts(SCRIPT_Disconnect, NULL, true, playernum);
 }
 
 void G_ScreenShot (char *filename)