diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp
index b1d8ac1f06..87bbc7eaeb 100644
--- a/routing/index_graph.cpp
+++ b/routing/index_graph.cpp
@@ -261,14 +261,7 @@ void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutg
   Joint::Id const jointId = m_roadIndex.GetJointId(roadPoint);
 
   if (jointId == Joint::kInvalidId)
-  {
-    if (IsJointOrEnd(parent, isOutgoing))
-    {
-      // It's not a joint but a loose end of a feature.
-      GetSegmentCandidateForRoadPoint(roadPoint, parent.GetMwmId(), isOutgoing, children);
-    }
     return;
-  }
 
   m_jointIndex.ForEachPoint(jointId, [&](RoadPoint const & rp) {
     GetSegmentCandidateForRoadPoint(rp, parent.GetMwmId(), isOutgoing, children);
diff --git a/routing/index_graph_starter_joints.hpp b/routing/index_graph_starter_joints.hpp
index 9a07257420..7f012c4fbf 100644
--- a/routing/index_graph_starter_joints.hpp
+++ b/routing/index_graph_starter_joints.hpp
@@ -599,7 +599,7 @@ std::vector<JointEdge> IndexGraphStarterJoints<Graph>::FindFirstJoints(Segment c
     // or it's the real one and its end (RoadPoint) is |Joint|.
     if (((!IsRealSegment(segment) && m_graph.ConvertToReal(segment) &&
           isEndOfSegment(beforeConvert, segment, fromStart)) || IsRealSegment(beforeConvert)) &&
-        IsJointOrEnd(segment, fromStart))
+        IsJoint(segment, fromStart))
     {
       addFake(segment, beforeConvert);
       continue;