diff --git a/Content.Server/Construction/Components/ConstructionComponent.cs b/Content.Server/Construction/Components/ConstructionComponent.cs
index 08da52c2a4..ffed8940c0 100644
--- a/Content.Server/Construction/Components/ConstructionComponent.cs
+++ b/Content.Server/Construction/Components/ConstructionComponent.cs
@@ -137,7 +137,7 @@ namespace Content.Server.Construction.Components
                 TargetPathfinding.Dequeue();
 
             // If we went the wrong way, we stop pathfinding.
-            if (Edge != null && TargetNextEdge != Edge)
+            if (Edge != null && TargetNextEdge != Edge && EdgeStep >= Edge.Steps.Count)
             {
                 ClearTarget();
                 return;