diff --git a/regamedll/dlls/observer.cpp b/regamedll/dlls/observer.cpp
index c35b17f9a..e0bdc6441 100644
--- a/regamedll/dlls/observer.cpp
+++ b/regamedll/dlls/observer.cpp
@@ -478,10 +478,19 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Observer_SetMode)(int iMode)
 	// verify observer target again
 	if (m_hObserverTarget)
 	{
+#ifdef REGAMEDLL_FIXES
+		m_hObserverTarget = Observer_IsValidTarget( ENTINDEX(m_hObserverTarget->edict()), forcecamera != CAMERA_MODE_SPEC_ANYONE );
+#else 
 		CBasePlayer *pTarget = m_hObserverTarget;
 
-		if (pTarget == this || !pTarget || pTarget->has_disconnected || pTarget->GetObserverMode() != OBS_NONE || (pTarget->pev->effects & EF_NODRAW) || (forcecamera != CAMERA_MODE_SPEC_ANYONE && pTarget->m_iTeam != m_iTeam))
+		if (pTarget == this 
+			|| !pTarget 
+			|| pTarget->has_disconnected 
+			|| pTarget->GetObserverMode() != OBS_NONE 
+			|| (pTarget->pev->effects & EF_NODRAW) 
+			|| (forcecamera != CAMERA_MODE_SPEC_ANYONE && pTarget->m_iTeam != m_iTeam))
 			m_hObserverTarget = nullptr;
+#endif
 	}
 
 	// set spectator mode