diff --git a/cl_dll/flashlight.cpp b/cl_dll/flashlight.cpp
index 8b8a8d0e..c3514c7d 100644
--- a/cl_dll/flashlight.cpp
+++ b/cl_dll/flashlight.cpp
@@ -49,6 +49,8 @@ void CHudFlashlight::Reset( void )
 {
 	m_fFade = 0;
 	m_fOn = 0;
+	m_iBat = 100;
+	m_flBat = 1.0;
 }
 
 int CHudFlashlight::VidInit( void )
diff --git a/dlls/player.cpp b/dlls/player.cpp
index 04da24c4..0d86caf8 100644
--- a/dlls/player.cpp
+++ b/dlls/player.cpp
@@ -3868,6 +3868,12 @@ void CBasePlayer::UpdateClientData( void )
 
 		FireTargets( "game_playerspawn", this, this, USE_TOGGLE, 0 );
 
+		// Send flashlight status
+		MESSAGE_BEGIN( MSG_ONE, gmsgFlashlight, NULL, pev );
+			WRITE_BYTE( FlashlightIsOn() ? 1 : 0 );
+			WRITE_BYTE( m_iFlashBattery );
+		MESSAGE_END();
+
 		InitStatusBar();
 	}