diff --git a/src/p_mobj.c b/src/p_mobj.c
index 52683a9fe..f5df30107 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8469,9 +8469,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 		case MT_BLUEBALL:
 			nummaprings++;
 			break;
-		case MT_RANDOMITEM:
-			nummapboxes++;
-			break;
 		default:
 			break;
 	}
diff --git a/src/p_setup.c b/src/p_setup.c
index aa5694713..c272464f9 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -983,6 +983,9 @@ static void P_LoadThings(void)
 			|| mt->type == 1702) // MT_AXISTRANSFERLINE
 			continue; // These were already spawned
 
+		if (mt->type == 2000) // MT_RANDOMITEM
+			nummapboxes++;
+
 		mt->mobj = NULL;
 		P_SpawnMapThing(mt);
 	}
diff --git a/src/p_user.c b/src/p_user.c
index 594f20786..c11bf8d19 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -7974,8 +7974,8 @@ static void P_DeathThink(player_t *player)
 		if (player->deadtimer > TICRATE)
 			player->playerstate = PST_REBORN;
 
-		// SRB2kart - spawn after 5 tics & Button press
-		if ((cmd->buttons & BT_JUMP || cmd->buttons & BT_ACCELERATE) && player->deadtimer > 5)
+		// SRB2kart - spawn after 1 second & Button press
+		if ((cmd->buttons & BT_JUMP || cmd->buttons & BT_ACCELERATE) && player->deadtimer > TICRATE)
 			player->playerstate = PST_REBORN;
 
 		// Single player auto respawn