diff --git a/Content.Server/Construction/ConstructionSystem.Pathfinding.cs b/Content.Server/Construction/ConstructionSystem.Pathfinding.cs
index a154aafb22..8d5cdb9a2c 100644
--- a/Content.Server/Construction/ConstructionSystem.Pathfinding.cs
+++ b/Content.Server/Construction/ConstructionSystem.Pathfinding.cs
@@ -13,10 +13,12 @@ namespace Content.Server.Construction
             if (!Resolve(uid, ref construction))
                 return false;
 
-            // Null means clear pathfinding target.
+            // Clear current target, just in case.
+            ClearPathfinding(uid, construction);
+
+            // Null means clear pathfinding target only.
             if (targetNodeId == null)
             {
-                ClearPathfinding(uid, construction);
                 return true;
             }