diff --git a/frontend/lib/registry/components/location-swap-selector/LocationSwapSelectorComponent.tsx b/frontend/lib/registry/components/location-swap-selector/LocationSwapSelectorComponent.tsx
index 045d62bd..732deb8b 100644
--- a/frontend/lib/registry/components/location-swap-selector/LocationSwapSelectorComponent.tsx
+++ b/frontend/lib/registry/components/location-swap-selector/LocationSwapSelectorComponent.tsx
@@ -115,11 +115,13 @@ export function LocationSwapSelectorComponent(props: LocationSwapSelectorProps)
         // 코드 관리에서 가져오기
         setLoading(true);
         try {
-          const response = await apiClient.get(`/api/codes/${dataSource.codeCategory}`);
+          const response = await apiClient.get(`/code-management/codes`, {
+            params: { categoryCode: dataSource.codeCategory },
+          });
           if (response.data.success && response.data.data) {
             const codeOptions = response.data.data.map((code: any) => ({
-              value: code.code_value || code.codeValue,
-              label: code.code_name || code.codeName,
+              value: code.code_value || code.codeValue || code.code,
+              label: code.code_name || code.codeName || code.name,
             }));
             setOptions(codeOptions);
           }
@@ -135,13 +137,17 @@ export function LocationSwapSelectorComponent(props: LocationSwapSelectorProps)
         // 테이블에서 가져오기
         setLoading(true);
         try {
-          const response = await apiClient.get(`/api/dynamic/${dataSource.tableName}`, {
-            params: { pageSize: 1000 },
+          const response = await apiClient.get(`/dynamic-form/list/${dataSource.tableName}`, {
+            params: { page: 1, pageSize: 1000 },
           });
           if (response.data.success && response.data.data) {
-            const tableOptions = response.data.data.map((row: any) => ({
-              value: row[dataSource.valueField || "id"],
-              label: row[dataSource.labelField || "name"],
+            // data가 배열인지 또는 data.rows인지 확인
+            const rows = Array.isArray(response.data.data) 
+              ? response.data.data 
+              : response.data.data.rows || [];
+            const tableOptions = rows.map((row: any) => ({
+              value: String(row[dataSource.valueField || "id"] || ""),
+              label: String(row[dataSource.labelField || "name"] || ""),
             }));
             setOptions(tableOptions);
           }