diff --git a/cl_dll/flashlight.cpp b/cl_dll/flashlight.cpp
index c3514c7d..ee3d6d22 100644
--- a/cl_dll/flashlight.cpp
+++ b/cl_dll/flashlight.cpp
@@ -108,6 +108,9 @@ int CHudFlashlight::Draw( float flTime )
 	int r, g, b, x, y, a;
 	wrect_t rc;
 
+	if( gEngfuncs.IsSpectateOnly() )
+		return 1;
+
 	if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_SUIT ) ) ) )
 		return 1;
 
diff --git a/dlls/player.cpp b/dlls/player.cpp
index b1d28e67..926bf1e1 100644
--- a/dlls/player.cpp
+++ b/dlls/player.cpp
@@ -1421,7 +1421,7 @@ void CBasePlayer::StartObserver( Vector vecPosition, Vector vecViewAngle )
 	MESSAGE_END();
 
 	// Setup flags
-	m_iHideHUD = ( HIDEHUD_HEALTH | HIDEHUD_WEAPONS );
+	m_iHideHUD = ( HIDEHUD_HEALTH | HIDEHUD_FLASHLIGHT | HIDEHUD_WEAPONS );
 	m_afPhysicsFlags |= PFLAG_OBSERVER;
 	pev->effects = EF_NODRAW;
 	pev->view_ofs = g_vecZero;