diff --git a/src/g_game.c b/src/g_game.c
index 9db9c413b..a2e9b881a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2230,6 +2230,8 @@ void G_PlayerReborn(INT32 player)
 	if (p->mare == 255)
 		p->mare = 0;
 
+	p->marelap = p->marebonuslap = 0;
+
 	// Check to make sure their color didn't change somehow...
 	if (G_GametypeHasTeams())
 	{
diff --git a/src/p_user.c b/src/p_user.c
index 4de9759c1..bd827e54a 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -588,6 +588,8 @@ static void P_DeNightserizePlayer(player_t *player)
 	player->climbing = 0;
 	player->mo->fuse = 0;
 	player->speed = 0;
+	player->marelap = 0;
+	player->marebonuslap = 0;
 	P_SetTarget(&player->mo->target, NULL);
 	P_SetTarget(&player->axis1, P_SetTarget(&player->axis2, NULL));