diff --git a/mp/src/game/client/c_fire_smoke.cpp b/mp/src/game/client/c_fire_smoke.cpp
index 34287bde..d73a97fb 100644
--- a/mp/src/game/client/c_fire_smoke.cpp
+++ b/mp/src/game/client/c_fire_smoke.cpp
@@ -345,6 +345,11 @@ void C_EntityFlame::CreateEffect( void )
 		C_BaseEntity *pEntity = m_hEntAttached;
 		m_hOldAttached = m_hEntAttached;
 
+		// --> Mirv: Don't attach to local player in first person mode
+		if (pEntity == CBasePlayer::GetLocalPlayer() && !input->CAM_IsThirdPerson())
+			return;
+		// <--
+
 		ParticleProp()->AddControlPoint( m_hEffect, 1, pEntity, PATTACH_ABSORIGIN_FOLLOW );
 		m_hEffect->SetControlPoint( 0, GetAbsOrigin() );
 		m_hEffect->SetControlPoint( 1, GetAbsOrigin() );