diff --git a/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua b/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua
index 9e50eb1..d65bb30 100644
--- a/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua
+++ b/beatrun/gamemodes/beatrun/entities/entities/tt_cp/shared.lua
@@ -100,7 +100,7 @@ function ENT:DrawTranslucent()
 		render.DrawBeam(newpos, newpos + circleup, 8, 0, 1, red, true)
 	end
 
-	local nextCP = Checkpoints[self:GetCPNum() + 1] or self
+	local nextCP = IsValid(Checkpoints[self:GetCPNum() + 1]) and Checkpoints[self:GetCPNum() + 1] or self
 
 	local selfpos = self:GetPos() + checkheight
 	local fwAng = (nextCP:GetPos() - selfpos):GetNormalized():Angle()