diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 68fc756569..808ef13be6 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -2063,6 +2063,8 @@ int ROUTER_TOOL::onTrackViaSizeChanged( const TOOL_EVENT& aEvent )
 
     // Changing the track width can affect the placement, so call the
     // move routine without changing the destination
+    // Update end item first to avoid moving to an invalid/missing item
+    updateEndItem( aEvent );
     m_router->Move( m_endSnapPoint, m_endItem );
 
     UpdateMessagePanel();