diff --git a/kibot/out_base.py b/kibot/out_base.py
index 9901ed41..0e1ccf6a 100644
--- a/kibot/out_base.py
+++ b/kibot/out_base.py
@@ -481,6 +481,7 @@ class VariantOptions(BaseOptions):
                 gi.SetLayer(self._fadhes)
             for gi in self.old_badhes:
                 gi.SetLayer(self._badhes)
+        if GS.global_remove_solder_mask_for_dnp:
             for gi in self.old_fmask:
                 gi.SetLayer(self._fmask)
             for gi in self.old_bmask: