diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc
index 73acb18..6f558a4 100644
--- a/userraw/maps/mp/bots/_bot_internal.gsc
+++ b/userraw/maps/mp/bots/_bot_internal.gsc
@@ -2001,6 +2001,17 @@ isInRange(dist, curweap)
 	return true;
 }
 
+killWalkCauseNoWaypoints()
+{
+	self endon("disconnect");
+	self endon("death");
+	self endon("kill_goal");
+
+	wait 2;
+
+	self notify("kill_goal");
+}
+
 /*
 	This is the main walking logic for the bot.
 */
@@ -2049,6 +2060,7 @@ walk()
 			goal = level.waypoints[randomInt(level.waypointCount)].origin;
 		else
 		{
+			self thread killWalkCauseNoWaypoints();
 			stepDist = 64;
 			forward = AnglesToForward(self GetPlayerAngles())*stepDist;
 			forward = (forward[0], forward[1], 0);