diff --git a/main/source/cl_dll/hud.cpp b/main/source/cl_dll/hud.cpp
index 7373d18f..3bbda729 100644
--- a/main/source/cl_dll/hud.cpp
+++ b/main/source/cl_dll/hud.cpp
@@ -229,7 +229,7 @@ void CHud :: Init( void )
 	CVAR_CREATE("hud_mapnamesBlue", "255", FCVAR_ARCHIVE);
 	CVAR_CREATE("hud_nameinfo", "1", FCVAR_ARCHIVE);
 	CVAR_CREATE("hud_drawwaypoints", "2", FCVAR_ARCHIVE);
-	CVAR_CREATE("hud_waypointblinking", "0", FCVAR_ARCHIVE);
+	CVAR_CREATE("hud_waypointblinking", "1", FCVAR_ARCHIVE);
 	m_pCvarWidescreen = gEngfuncs.pfnGetCvarPointer("gl_widescreen_yfov");
 
 	m_pSpriteList = NULL;
diff --git a/main/source/mod/AvHHud.cpp b/main/source/mod/AvHHud.cpp
index 3277bfbb..757b29d6 100644
--- a/main/source/mod/AvHHud.cpp
+++ b/main/source/mod/AvHHud.cpp
@@ -2831,8 +2831,6 @@ int	AvHHud::MsgFunc_SetOrder(const char* pszName, int iSize, void* pbuf)
 		{
 			this->mDrawOrderOverlay = true;
 		}
-		if (!this->mDrawOrderOverlay)
-			gEngfuncs.Con_Printf("waypoint trapped \n");
 	}
 	else 
 	{
diff --git a/main/source/mod/AvHOverviewMap.cpp b/main/source/mod/AvHOverviewMap.cpp
index 1e785177..6f3b3ad1 100644
--- a/main/source/mod/AvHOverviewMap.cpp
+++ b/main/source/mod/AvHOverviewMap.cpp
@@ -386,7 +386,7 @@ void AvHOverviewMap::DrawMiniMapEntity(const DrawInfo& inDrawInfo, const Drawabl
                 
             float theFractionalLastUpdate = mLastUpdateTime - (int)mLastUpdateTime;
         
-            if (theFractionalLastUpdate < .25f) 
+			if (theFractionalLastUpdate < .25f && CVAR_GET_FLOAT("hud_waypointblinking") >= 1.0f)
             {
     	        return;
             }