diff --git a/frontend/lib/registry/components/table-list/TableListComponent.tsx b/frontend/lib/registry/components/table-list/TableListComponent.tsx
index 03bac5d2..109fd948 100644
--- a/frontend/lib/registry/components/table-list/TableListComponent.tsx
+++ b/frontend/lib/registry/components/table-list/TableListComponent.tsx
@@ -140,12 +140,15 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
     if (!tableConfig.selectedTable) return;
 
     try {
-      const columns = await tableTypeApi.getColumns(tableConfig.selectedTable);
+      const response = await tableTypeApi.getColumns(tableConfig.selectedTable);
+      // API 응답 구조 확인 및 컬럼 배열 추출
+      const columns = response.columns || response;
       const labels: Record<string, string> = {};
       columns.forEach((column: any) => {
         labels[column.columnName] = column.displayName || column.columnName;
       });
       setColumnLabels(labels);
+      console.log("🔍 컬럼 라벨 설정 완료:", labels);
     } catch (error) {
       console.log("컬럼 라벨 정보를 가져올 수 없습니다:", error);
     }
@@ -271,12 +274,17 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
 
             if (originalColumnIndex !== -1) {
               console.log(`🔄 컬럼 교체: ${joinConfig.sourceColumn} → ${joinConfig.aliasColumn}`);
+              const originalColumn = processedColumns[originalColumnIndex];
               processedColumns[originalColumnIndex] = {
-                ...processedColumns[originalColumnIndex],
+                ...originalColumn,
                 columnName: joinConfig.aliasColumn, // dept_code → dept_code_name
-                displayName: processedColumns[originalColumnIndex].displayName || joinConfig.aliasColumn,
+                displayName:
+                  columnLabels[originalColumn.columnName] || originalColumn.displayName || originalColumn.columnName, // 올바른 라벨 사용
                 // isEntityJoined: true, // 🎯 임시 주석 처리 (타입 에러 해결 후 복원)
               } as ColumnConfig;
+              console.log(
+                `✅ 조인 컬럼 라벨 유지: ${joinConfig.sourceColumn} → "${columnLabels[originalColumn.columnName] || originalColumn.displayName || originalColumn.columnName}"`,
+              );
             }
           });
         }