diff --git a/modules/processing_diffusers.py b/modules/processing_diffusers.py
index ec2683b0f..cbabc61fb 100644
--- a/modules/processing_diffusers.py
+++ b/modules/processing_diffusers.py
@@ -56,7 +56,7 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro
         pipeline = model
         signature = inspect.signature(type(pipeline).__call__)
         possible = signature.parameters.keys()
-        generator_device = 'cpu' if shared.opts.diffusers_generator_device == "cpu" else shared.device
+        generator_device = devices.cpu if shared.opts.diffusers_generator_device == "cpu" else shared.device
         generator = [torch.Generator(generator_device).manual_seed(s) for s in seeds]
         if 'prompt' in possible:
             if hasattr(model, 'text_encoder') and 'prompt_embeds' in possible:
@@ -161,7 +161,9 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro
 
     if refiner_enabled:
         for i in range(len(output.images)):
-            if shared.opts.save and not p.do_not_save_samples and shared.opts.save_images_before_refiner and hasattr(shared.sd_model, 'vae'):
+            #shared.cmd_opts.medvram or shared.opts.diffusers_model_cpu_offload:
+            #Model CPU Offload doesn't unload the base model without this.
+            if ((shared.opts.save and not p.do_not_save_samples and shared.opts.save_images_before_refiner) or shared.cmd_opts.medvram or shared.opts.diffusers_model_cpu_offload) and hasattr(shared.sd_model, 'vae'):
                 from modules.processing import create_infotext
                 info=create_infotext(p, p.all_prompts, p.all_seeds, p.all_subseeds, [], iteration=p.iteration, position_in_batch=i)
                 decoded = vae_decode(output.images, shared.sd_model, output_type='pil')
@@ -170,7 +172,7 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro
 
         if shared.opts.diffusers_move_base and not shared.sd_model.has_accelerate:
             shared.log.debug('Diffusers: Moving base model to CPU')
-            shared.sd_model.to('cpu')
+            shared.sd_model.to(devices.cpu)
             devices.torch_gc()
 
         if (not hasattr(shared.sd_refiner.scheduler, 'name')) or (shared.sd_refiner.scheduler.name != p.latent_sampler) and (p.sampler_name != 'Default'):
@@ -207,7 +209,7 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro
 
         if shared.opts.diffusers_move_refiner and not shared.sd_refiner.has_accelerate:
             shared.log.debug('Diffusers: Moving refiner model to CPU')
-            shared.sd_refiner.to('cpu')
+            shared.sd_refiner.to(devices.cpu)
     else:
         results = output.images
 
diff --git a/modules/sd_models.py b/modules/sd_models.py
index 6c3ea782e..cc1f92cb4 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -713,7 +713,7 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No
                         shared.opts.diffusers_move_base=True
                         shared.opts.diffusers_move_refiner=True
                     shared.log.debug('Moving base model to CPU')
-                    model_data.sd_model.to("cpu")
+                    model_data.sd_model.to(devices.cpu)
                     devices.torch_gc(force=True)
                     sd_model.to(devices.device)
                     base_sent_to_cpu=True
@@ -747,7 +747,7 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No
             sd_model.set_progress_bar_config(bar_format='Progress {rate_fmt}{postfix} {bar} {percentage:3.0f}% {n_fmt}/{total_fmt} {elapsed} {remaining}', ncols=80, colour='#327fba')
         if op == 'refiner' and shared.opts.diffusers_move_refiner and not sd_model.has_accelerate:
             shared.log.debug('Moving refiner model to CPU')
-            sd_model.to("cpu")
+            sd_model.to(devices.cpu)
         elif not sd_model.has_accelerate:
             # In offload modes, accelerate will move models around.
             sd_model.to(devices.device)