diff --git a/src/p_user.c b/src/p_user.c
index 272d006f..03ea25a4 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8812,7 +8812,7 @@ boolean P_SpectatorJoinGame(player_t *player)
 	{
 		if (P_IsLocalPlayer(player))
 			CONS_Printf(M_GetText("Server does not allow team change.\n"));
-		player->powers[pw_flashing] += 2*TICRATE; //to prevent message spam.
+		player->powers[pw_flashing] = 2*TICRATE; //to prevent message spam.
 	}
 	// Team changing in Team Match and CTF
 	// Pressing fire assigns you to a team that needs players if allowed.
@@ -9301,7 +9301,7 @@ void P_PlayerThink(player_t *player)
 	if ((netgame || splitscreen) && player->spectator && cmd->buttons & BT_ATTACK && !player->powers[pw_flashing])
 	{
 		player->pflags ^= PF_WANTSTOJOIN;
-		player->powers[pw_flashing] += 2*TICRATE;
+		player->powers[pw_flashing] = 2*TICRATE;
 		/*if (P_SpectatorJoinGame(player))
 			return; // player->mo was removed.*/
 	}
@@ -9454,7 +9454,8 @@ void P_PlayerThink(player_t *player)
 	if (player->powers[pw_invulnerability] && player->powers[pw_invulnerability] < UINT16_MAX)
 		player->powers[pw_invulnerability]--;
 
-	if (player->powers[pw_flashing] && player->powers[pw_flashing] < UINT16_MAX && ((player->pflags & PF_NIGHTSMODE) || player->powers[pw_flashing] < K_GetKartFlashing()))
+	if (player->powers[pw_flashing] && player->powers[pw_flashing] < UINT16_MAX && ((player->pflags & PF_NIGHTSMODE)
+		|| (player->spectator || player->powers[pw_flashing] < K_GetKartFlashing())))
 		player->powers[pw_flashing]--;
 
 	if (player->powers[pw_tailsfly] && player->powers[pw_tailsfly] < UINT16_MAX && player->charability != CA_SWIM && !(player->powers[pw_super] && ALL7EMERALDS(player->powers[pw_emeralds]))) // tails fly counter