diff --git a/Example/examples/Text.js b/Example/examples/Text.js
index d45c09fb..68d8004d 100644
--- a/Example/examples/Text.js
+++ b/Example/examples/Text.js
@@ -122,14 +122,10 @@ class TextPath extends Component{
 
     render() {
         const path = `
-                    M 0 20
-                    h 10
-                    C 20 10 30  0 40 10
-                    C 50 20 60 30 70 20
-                    C 80 10 90 10 90 10
-                    C 110 20 120 30 120 20
-                    C 140 10 150 10 150 10
-                    a 50 50 0 1 1 20 110
+                    M 10 20
+                     C 20 10 30   0 40 10
+                     C 50 20 60 30 70 20
+                     C 80 10 90 10 90 10
                 `;
 
         return <Svg
diff --git a/ios/Text/RNSVGBezierPath.m b/ios/Text/RNSVGBezierPath.m
index 2e37206d..f416d140 100644
--- a/ios/Text/RNSVGBezierPath.m
+++ b/ios/Text/RNSVGBezierPath.m
@@ -106,7 +106,11 @@ static CGFloat Distance(CGPoint a, CGPoint b) {
 - (CGAffineTransform)transformAtDistance:(CGFloat)distance
 {
     if (_offset == 0) {
-        [self setControlPoints];
+        if (_bezierCurves.count == _bezierIndex) {
+            return CGAffineTransformMakeScale(0, 0);
+        } else {
+            [self setControlPoints];
+        }
     }
 
     CGFloat offset = [self offsetAtDistance:distance - _lastX
diff --git a/ios/Text/RNSVGText.m b/ios/Text/RNSVGText.m
index 25a2c564..a2ca287b 100644
--- a/ios/Text/RNSVGText.m
+++ b/ios/Text/RNSVGText.m
@@ -112,6 +112,12 @@ static void RNSVGFreeTextFrame(RNSVGTextFrame frame)
             // draw glyphs along path
             if (self.path) {
                 transform = [bezierPath transformAtDistance:point.x];
+                
+                // break loop if line reaches the end of the Path.
+                if (!transform.a || !transform.d) {
+                    CGPathRelease(letter);
+                    break;
+                }
                 transform = CGAffineTransformScale(transform, 1.0, -1.0);
             } else {
                 transform = CGAffineTransformTranslate(upsideDown, point.x, point.y);