diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
index 63ee977b9..76826bcb1 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
@@ -1050,7 +1050,7 @@ private void EndRegionSelection()
 
             if (shape != null)
             {
-                if (!IsCurrentRectangleValid)
+                if (!shape.IsValidShape)
                 {
                     shape.Rectangle = Rectangle.Empty;
 
@@ -1063,6 +1063,7 @@ private void EndRegionSelection()
                     else
                     {
                         DeleteCurrentShape();
+                        shape = null;
                     }
                 }