diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31acc962..86637301 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG for FlatCAM beta
 - in Tcl command `add_polygon` added ability to use `-p_coords` optional parameter where the value of this argument should be a list of tuple coordinates
 - minor fixes in the Milling Plugin
 - if `Start Z` parameter is set in Edit -> Preferences now there is no extra lift GCode because it is replaced by the startz GCode (except for `laser` preprocessors)
+- if `Start Z` parameter is set in Edit -> Preferences now there is no extra lift GCode because it is replaced by the startz GCode (except for `laser` preprocessors) - for Drilling Plugin too
 
 13.02.2022
 
diff --git a/camlib.py b/camlib.py
index 8ec34c24..e031a3bf 100644
--- a/camlib.py
+++ b/camlib.py
@@ -3456,7 +3456,9 @@ class CNCjob(Geometry):
             t_gcode += self.doformat(p.toolchange_code, toolchangexy=(temp_locx, temp_locy))
             t_gcode += self.doformat(p.z_feedrate_code)
         else:
-            t_gcode += self.doformat(p.lift_code)
+            if self.startz is None or 'laser' in self.pp_excellon_name.lower():
+                t_gcode += self.doformat(p.lift_code)
+            t_gcode += self.doformat(p.startz_code)
 
         # Spindle start
         t_gcode += self.doformat(p.spindle_code)
@@ -3937,7 +3939,7 @@ class CNCjob(Geometry):
             t_gcode += self.doformat(p.toolchange_code)
         else:
             if self.startz is None or 'laser' in self.pp_geometry_name.lower():
-                t_gcode += self.doformat(p.lift_code, x=0, y=0)  # Move (up) to travel height
+                t_gcode += self.doformat(p.lift_code, x=0, y=0)
             t_gcode += self.doformat(p.startz_code, x=0, y=0)
 
         # Spindle start