diff --git a/PlayerVisibility/scripting/PlayerVisibility.sp b/PlayerVisibility/scripting/PlayerVisibility.sp
index ae6c3758..ec36bd27 100644
--- a/PlayerVisibility/scripting/PlayerVisibility.sp
+++ b/PlayerVisibility/scripting/PlayerVisibility.sp
@@ -229,6 +229,9 @@ public void Event_Spawn(Event event, const char[] name, bool dontBroadcast)
 
 public Action Timer_SpawnPost(Handle timer, int client)
 {
+	if(!IsClientInGame(client) || !IsPlayerAlive(client))
+		return Plugin_Stop;
+
 	ToolsSetEntityAlpha(client, 255);
 	g_Client_Alpha[client] = 255;
 	g_Client_bEnabled[client] = true;