diff --git a/src/bonsai/bonsai/bim/module/model/wall.py b/src/bonsai/bonsai/bim/module/model/wall.py
index b1b9680c26..cb273177e5 100644
--- a/src/bonsai/bonsai/bim/module/model/wall.py
+++ b/src/bonsai/bonsai/bim/module/model/wall.py
@@ -545,6 +545,7 @@ class DrawPolylineWall(bpy.types.Operator):
             PolylineDecorator.install(context)
             tool.Snap.clear_snapping_point()
             tool.Snap.set_use_default_container(True)
+            tool.Snap.clear_snap_angle()
             PolylineDecorator.set_use_default_container(True)
             tool.Polyline.set_use_default_container(True)
             tool.Snap.set_snap_axis_method(None)
diff --git a/src/bonsai/bonsai/tool/snap.py b/src/bonsai/bonsai/tool/snap.py
index 716b67a037..f0668f2320 100644
--- a/src/bonsai/bonsai/tool/snap.py
+++ b/src/bonsai/bonsai/tool/snap.py
@@ -41,6 +41,10 @@ class Snap(bonsai.core.tool.Snap):
     def set_snap_plane_method(cls, value=True):
         cls.snap_plane_method = value
 
+    @classmethod
+    def clear_snap_angle(cls):
+        cls.snap_angle = None
+
     @classmethod
     def cycle_snap_plane_method(cls, value=True):
         if cls.snap_plane_method == value:
@@ -417,7 +421,6 @@ class Snap(bonsai.core.tool.Snap):
 
         # TODO It only work for XY plane. Make it work also for None plane_method
         rot_intersection = None
-        cls.snap_angle = None
         if not cls.snap_plane_method:
             if cls.snap_axis_method == "X":
                 cls.snap_angle = 180