diff --git a/src/BRepLib/BRepLib_1.cxx b/src/BRepLib/BRepLib_1.cxx
index 5366ebf50f..a5cca92896 100644
--- a/src/BRepLib/BRepLib_1.cxx
+++ b/src/BRepLib/BRepLib_1.cxx
@@ -101,7 +101,8 @@ static Standard_Boolean findNearestValidPoint(
         // cycle to go out of local singularity
         gp_Vec aD1;
         theCurve.D1(anUOut, aP, aD1);
-        if (aD1.SquareMagnitude() < aD1Mag)
+        isOut = (aP.SquareDistance(theVertPnt) > aSqTol);
+        if (!isOut && aD1.SquareMagnitude() < aD1Mag)
         {
           aStepLocal *= 2.;
           anUOut += aStepLocal;
diff --git a/tests/bugs/modalg_7/bug30090 b/tests/bugs/modalg_7/bug30090
new file mode 100644
index 0000000000..59c7dd2d4b
--- /dev/null
+++ b/tests/bugs/modalg_7/bug30090
@@ -0,0 +1,12 @@
+puts "========"
+puts "OCC30090: Modeling Algorithms - BRepLib::FindValidRange does not find valid range for the edge"
+puts "========"
+puts ""
+
+restore [locate_data_file bug30090_edge.brep] e
+if {[regexp {([-0-9.+eE]+) ([-0-9.+eE]+)} [validrange e] full first last]} {
+  checkreal First $first 0.043210875526017684 1.e-7 0
+  checkreal Last $last 0.98374162670821774 1.e-7 0
+} else {
+  puts "Error: valid range is not found"
+}