diff --git a/src/mcore_bridge/bridge/gpt_bridge.py b/src/mcore_bridge/bridge/gpt_bridge.py
index 7039a91..2a4ad4b 100644
--- a/src/mcore_bridge/bridge/gpt_bridge.py
+++ b/src/mcore_bridge/bridge/gpt_bridge.py
@@ -267,7 +267,8 @@ def _set_module(self, mg_module, hf_state_dict, hf_prefix: str, to_mcore: bool):
                 new_state_dict = {}
                 for k, v in hf_state_dict.items():
                     if self._peft_format:
-                        if '.lora_A.' in k or '.lora_B.' in k or '.modules_to_save.' in k:
+                        if ('.lora_A.' in k or '.lora_B.' in k
+                                or '.modules_to_save.' in k) and f'{self._adapter_name}.' in k:
                             k = k.replace(f'{self._adapter_name}.', '')
                             new_state_dict[k] = v
                     else:
@@ -1703,7 +1704,7 @@ def export_weights(
         self.config = mg_models[0].config
         with torch.no_grad():
             for k, v in self._convert(mg_models, {}, hf_prefix, False, tqdm_desc=tqdm_desc):
-                if converter:
+                if converter and v is not None:
                     kv = converter(k, v)
                     if kv is None:
                         continue