diff --git a/scripts/convert.py b/scripts/convert.py
index 6a4eb10..92451ef 100644
--- a/scripts/convert.py
+++ b/scripts/convert.py
@@ -166,16 +166,6 @@ def do_convert(model, checkpoint_formats: List[str],
 
     print("Converting model...")
 
-    bake_in_vae_filename = sd_vae.vae_dict.get(bake_in_vae, None)
-    if bake_in_vae_filename is not None:
-        print(f"Baking in VAE from {bake_in_vae_filename}")
-        vae_dict = sd_vae.load_vae_dict(bake_in_vae_filename, map_location='cpu')
-
-        for k, v in vae_dict.items():
-            _hf(k, vae_dict[k])
-
-        del vae_dict
-
     if conv_type == "ema-only":
         for k in tqdm.tqdm(state_dict):
             ema_k = "___"
@@ -199,6 +189,16 @@ def do_convert(model, checkpoint_formats: List[str],
         for k, v in tqdm.tqdm(state_dict.items()):
             _hf(k, v)
 
+    bake_in_vae_filename = sd_vae.vae_dict.get(bake_in_vae, None)
+    if bake_in_vae_filename is not None:
+        print(f"Baking in VAE from {bake_in_vae_filename}")
+        vae_dict = sd_vae.load_vae_dict(bake_in_vae_filename, map_location='cpu')
+
+        for k, v in vae_dict.items():
+            _hf(k, vae_dict[k])
+
+        del vae_dict
+
     output = ""
     ckpt_dir = shared.cmd_opts.ckpt_dir or sd_models.model_path
     save_name = f"{model_info.model_name}-{precision}"