diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 8e0a3bda6..be69999e0 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -251,6 +251,7 @@ class XYZGridScript(scripts_manager.Script):
         except Exception as e:
             log.error(f"XYZ grid: invalid axis values {e}")
             errors.display(e, 'xyz')
+            shared.state.end(jobid)
             return None
 
         Image.MAX_IMAGE_PIXELS = None # disable check in Pillow and rely on check below to allow large custom image sizes
diff --git a/scripts/xyz_grid_on.py b/scripts/xyz_grid_on.py
index 7bbb67368..df17c4fb0 100644
--- a/scripts/xyz_grid_on.py
+++ b/scripts/xyz_grid_on.py
@@ -267,6 +267,7 @@ class XYZGridScript(scripts_manager.Script):
         except Exception as e:
             log.error(f"XYZ grid: invalid axis values {e}")
             errors.display(e, 'xyz')
+            active = False
             return None
 
         Image.MAX_IMAGE_PIXELS = None # disable check in Pillow and rely on check below to allow large custom image sizes