diff --git a/app/chain/transfer.py b/app/chain/transfer.py
index 0f54d3f8..933fb50d 100644
--- a/app/chain/transfer.py
+++ b/app/chain/transfer.py
@@ -407,7 +407,7 @@ class TransferChain(ChainBase):
                 else:
                     # 未指定目标路径，根据媒体信息获取目标目录
                     target_directory = self.directoryhelper.get_dir(file_mediainfo,
-                                                                    storage=target_storage,
+                                                                    storage=file_item.storage,
                                                                     target_storage=target_storage)
 
             # 执行整理
diff --git a/app/helper/directory.py b/app/helper/directory.py
index 6731ed62..f3ecb9ae 100644
--- a/app/helper/directory.py
+++ b/app/helper/directory.py
@@ -68,12 +68,14 @@ class DirectoryHelper:
         # 电影/电视剧
         media_type = media.type.value
         dirs = self.get_dirs()
+        # 是否下载器匹配
+        not_downloader: bool = src_path or dest_path or target_storage
         # 已匹配的目录
         matched_dirs: List[schemas.TransferDirectoryConf] = []
         # 按照配置顺序查找
         for d in dirs:
             # 没有启用整理的目录
-            if not d.monitor_type:
+            if not d.monitor_type and not_downloader:
                 continue
             # 源存储类型不匹配
             if storage and d.storage != storage: