diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 6546146f79..c531372ee9 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -1719,7 +1719,10 @@ class DraftToolBar:
             self.mask = val
             if hasattr(FreeCADGui, "Snapper"):
                 FreeCADGui.Snapper.mask = val
-                self.new_point = FreeCADGui.Snapper.constrain(self.new_point, self.get_last_point())
+                if self.new_point is not None:
+                    self.new_point = FreeCADGui.Snapper.constrain(
+                        self.new_point, self.get_last_point()
+                    )
 
     def changeXValue(self, d):
         if self.display_point_active: