diff --git a/frontend/components/screen/panels/DetailSettingsPanel.tsx b/frontend/components/screen/panels/DetailSettingsPanel.tsx
index 8543cc71..8423f164 100644
--- a/frontend/components/screen/panels/DetailSettingsPanel.tsx
+++ b/frontend/components/screen/panels/DetailSettingsPanel.tsx
@@ -1013,6 +1013,8 @@ export const DetailSettingsPanel: React.FC<DetailSettingsPanelProps> = ({
                 currentTable,
                 columns: currentTable?.columns,
                 columnsLength: currentTable?.columns?.length,
+                sampleColumn: currentTable?.columns?.[0],
+                deptCodeColumn: currentTable?.columns?.find((col) => col.columnName === "dept_code"),
               });
               return currentTable?.columns || [];
             })()}
diff --git a/frontend/lib/api/client.ts b/frontend/lib/api/client.ts
index 2660014f..a02871d0 100644
--- a/frontend/lib/api/client.ts
+++ b/frontend/lib/api/client.ts
@@ -6,12 +6,12 @@ const getApiBaseUrl = (): string => {
     const currentHost = window.location.hostname;
     const currentPort = window.location.port;
 
-    // 로컬 개발환경: localhost:9771 또는 localhost:3000 → localhost:8080
+    // 로컬 개발환경: localhost:9771 또는 localhost:3000 → localhost:3001
     if (
       (currentHost === "localhost" || currentHost === "127.0.0.1") &&
       (currentPort === "9771" || currentPort === "3000")
     ) {
-      return "http://localhost:8080/api";
+      return "http://localhost:3001/api";
     }
 
     // 서버 환경에서 localhost:5555 → 39.117.244.52:8080
diff --git a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
index bf150fe5..a2b2997e 100644
--- a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
+++ b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
@@ -370,6 +370,12 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
     // 이미 로드된 경우 스킵
     if (entityDisplayConfigs[configKey]) return;
 
+    // sourceTable과 joinTable이 모두 있어야 로드
+    if (!sourceTable || !joinTable) {
+      console.log("⚠️ sourceTable 또는 joinTable이 비어있어서 로드 스킵:", { sourceTable, joinTable });
+      return;
+    }
+
     try {
       // 기본 테이블과 조인 테이블의 컬럼 정보를 병렬로 로드
       const [sourceResult, joinResult] = await Promise.all([