diff --git a/modules/processing.py b/modules/processing.py
index 8743ac0a..6625f2de 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -148,8 +148,8 @@ class StableDiffusionProcessing:
         self.s_min_uncond = s_min_uncond or opts.s_min_uncond
         self.s_churn = s_churn or opts.s_churn
         self.s_tmin = s_tmin or opts.s_tmin
-        self.s_tmax = opts.data.get('s_tmax', s_tmax or 0) or float('inf')  # not representable as a standard ui option
-        self.s_noise = s_noise if s_noise is not None else opts.data.get('s_noise', 1.0)
+        self.s_tmax = (s_tmax if s_tmax is not None else opts.s_tmax) or float('inf')
+        self.s_noise = s_noise if s_noise is not None else opts.s_noise
         self.override_settings = {k: v for k, v in (override_settings or {}).items() if k not in shared.restricted_opts}
         self.override_settings_restore_afterwards = override_settings_restore_afterwards
         self.is_using_inpainting_conditioning = False