diff --git a/src/TaxBaik.Web/Pages/Admin/Clients/Index.cshtml b/src/TaxBaik.Web/Pages/Admin/Clients/Index.cshtml
index d4533cc..a2ce8c6 100644
--- a/src/TaxBaik.Web/Pages/Admin/Clients/Index.cshtml
+++ b/src/TaxBaik.Web/Pages/Admin/Clients/Index.cshtml
@@ -38,31 +38,31 @@
         </div>
     </form>
 
-    <div class="card">
-        <div class="table-responsive">
-            <table class="table table-vcenter card-table table-hover">
-                <thead>
-                    <tr>
-                        <th>고객명</th>
-                        <th>회사명</th>
-                        <th>전화</th>
-                        <th>상태</th>
-                        <th>등록일</th>
-                        <th class="text-end">작업</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @if (Model.Items.Count == 0)
-                    {
+    @if (Model.Items.Count == 0)
+    {
+        <div class="card">
+            <div class="card-body">
+                @await Html.PartialAsync("_EmptyState", "검색 결과가 없습니다.")
+            </div>
+        </div>
+    }
+    else
+    {
+        <div class="card">
+            <div class="table-responsive">
+                <table class="table table-vcenter card-table table-hover">
+                    <thead>
                         <tr>
-                            <td colspan="6">
-                                @await Html.PartialAsync("_EmptyState", "검색 결과가 없습니다.")
-                            </td>
+                            <th>고객명</th>
+                            <th>회사명</th>
+                            <th>전화</th>
+                            <th>상태</th>
+                            <th>등록일</th>
+                            <th class="text-end">작업</th>
                         </tr>
-                    }
-                    else
-                    {
-                        foreach (var item in Model.Items)
+                    </thead>
+                    <tbody>
+                        @foreach (var item in Model.Items)
                         {
                             <tr>
                                 <td class="fw-semibold">@item.Name</td>
@@ -78,11 +78,11 @@
                                 </td>
                             </tr>
                         }
-                    }
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
         </div>
-    </div>
+    }
 
     @await Html.PartialAsync("_Pagination", new TaxBaik.Web.Pages.Shared.PaginationModel(Model.CurrentPage, Model.TotalPages, Model.BuildPageUrl))
 </section>
diff --git a/src/TaxBaik.Web/Pages/Admin/Companies/Index.cshtml b/src/TaxBaik.Web/Pages/Admin/Companies/Index.cshtml
index 27e2988..876ef35 100644
--- a/src/TaxBaik.Web/Pages/Admin/Companies/Index.cshtml
+++ b/src/TaxBaik.Web/Pages/Admin/Companies/Index.cshtml
@@ -4,20 +4,24 @@
 
 <section class="admin-page-shell">
     @await Html.PartialAsync("_AdminPageHeader", new TaxBaik.Web.Models.AdminPageHeaderModel("CRM", "회사 관리", "고객사 회사를 관리합니다.", null, null))
-    <div class="card">
-        <div class="table-responsive">
-            <table class="table table-vcenter card-table">
-                <thead>
-                    <tr><th>코드</th><th>회사명</th><th>담당자</th><th>활성</th></tr>
-                </thead>
-                <tbody>
-                @if (Model.Items.Count == 0)
-                {
-                    <tr><td colspan="4">@await Html.PartialAsync("_EmptyState", "회사가 없습니다.")</td></tr>
-                }
-                else
-                {
-                    foreach (var item in Model.Items)
+    @if (Model.Items.Count == 0)
+    {
+        <div class="card">
+            <div class="card-body">
+                @await Html.PartialAsync("_EmptyState", "회사가 없습니다.")
+            </div>
+        </div>
+    }
+    else
+    {
+        <div class="card">
+            <div class="table-responsive">
+                <table class="table table-vcenter card-table">
+                    <thead>
+                        <tr><th>코드</th><th>회사명</th><th>담당자</th><th>활성</th></tr>
+                    </thead>
+                    <tbody>
+                    @foreach (var item in Model.Items)
                     {
                         <tr>
                             <td>@item.CompanyCode</td>
@@ -26,11 +30,11 @@
                             <td>@await Html.PartialAsync("_StatusBadge", item.IsActive ? "active" : "inactive")</td>
                         </tr>
                     }
-                }
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
         </div>
-    </div>
+    }
 </section>
 
 
diff --git a/src/TaxBaik.Web/Pages/Admin/TaxProfiles/Index.cshtml b/src/TaxBaik.Web/Pages/Admin/TaxProfiles/Index.cshtml
index 0640420..40f0fbb 100644
--- a/src/TaxBaik.Web/Pages/Admin/TaxProfiles/Index.cshtml
+++ b/src/TaxBaik.Web/Pages/Admin/TaxProfiles/Index.cshtml
@@ -4,20 +4,24 @@
 
 <section class="admin-page-shell">
     @await Html.PartialAsync("_AdminPageHeader", new TaxBaik.Web.Models.AdminPageHeaderModel("Tax", "세무 프로필 관리", "고객별 세무 속성을 관리합니다.", null, null))
-    <div class="card">
-        <div class="table-responsive">
-            <table class="table table-vcenter card-table">
-                <thead>
-                    <tr><th>고객ID</th><th>사업유형</th><th>세무위험</th><th>다음신고일</th></tr>
-                </thead>
-                <tbody>
-                @if (Model.Items.Count == 0)
-                {
-                    <tr><td colspan="4">@await Html.PartialAsync("_EmptyState", "세무 프로필이 없습니다.")</td></tr>
-                }
-                else
-                {
-                    foreach (var item in Model.Items)
+    @if (Model.Items.Count == 0)
+    {
+        <div class="card">
+            <div class="card-body">
+                @await Html.PartialAsync("_EmptyState", "세무 프로필이 없습니다.")
+            </div>
+        </div>
+    }
+    else
+    {
+        <div class="card">
+            <div class="table-responsive">
+                <table class="table table-vcenter card-table">
+                    <thead>
+                        <tr><th>고객ID</th><th>사업유형</th><th>세무위험</th><th>다음신고일</th></tr>
+                    </thead>
+                    <tbody>
+                    @foreach (var item in Model.Items)
                     {
                         <tr>
                             <td>@item.ClientId</td>
@@ -26,11 +30,11 @@
                             <td>@item.NextFilingDueDate?.ToString("yyyy-MM-dd")</td>
                         </tr>
                     }
-                }
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
         </div>
-    </div>
+    }
 </section>