diff --git a/src/Avalonia.Visuals/Media/PathMarkupParser.cs b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
index 2ffff75de3..e8824753b5 100644
--- a/src/Avalonia.Visuals/Media/PathMarkupParser.cs
+++ b/src/Avalonia.Visuals/Media/PathMarkupParser.cs
@@ -201,13 +201,23 @@ namespace Avalonia.Media
                     break;
                 }
             }
+
+            if (_isOpen != null)
+            {
+                _geometryContext.EndFigure(false);
+            }
         }
 
         private void CreateFigure()
         {
+            if (_isOpen != null)
+            {
+                _geometryContext.EndFigure(false);
+            }
+
             _geometryContext.BeginFigure(_currentPoint);
 
-            this._isOpen = true;
+            _isOpen = true;
         }
 
         private void SetFillRule(CommandToken commandToken)