diff --git a/src/Mod/Draft/draftguitools/gui_snapper.py b/src/Mod/Draft/draftguitools/gui_snapper.py
index 5bc619a932..6ff2db3c1b 100644
--- a/src/Mod/Draft/draftguitools/gui_snapper.py
+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
@@ -1653,7 +1653,7 @@ class Snapper:
                 self.trackers[9].append(self.holdTracker)
             self.activeview = v
 
-        if self.grid and (not self.forceGridOff):
+        if tool and self.grid and (not self.forceGridOff):
             self.grid.set(tool)