diff --git a/app/Http/Requests/UpdateTenantRequest.php b/app/Http/Requests/UpdateTenantRequest.php
index 8c5ad504..6c3bff03 100644
--- a/app/Http/Requests/UpdateTenantRequest.php
+++ b/app/Http/Requests/UpdateTenantRequest.php
@@ -20,7 +20,7 @@ public function authorize(): bool
      */
     public function rules(): array
     {
-        $tenantId = $this->route('tenant');
+        $tenantId = $this->route('id');
 
         return [
             // 기본 정보 (필수)
diff --git a/app/Services/TenantService.php b/app/Services/TenantService.php
index beea804b..7c05368e 100644
--- a/app/Services/TenantService.php
+++ b/app/Services/TenantService.php
@@ -104,6 +104,13 @@ public function restoreTenant(int $id): bool
     public function forceDeleteTenant(int $id): bool
     {
         $tenant = Tenant::withTrashed()->findOrFail($id);
+
+        // 관련 데이터 먼저 삭제
+        $tenant->users()->detach(); // user_tenants 관계 삭제
+        $tenant->departments()->forceDelete(); // 부서 영구 삭제
+        $tenant->menus()->forceDelete(); // 메뉴 영구 삭제
+        $tenant->roles()->forceDelete(); // 역할 영구 삭제
+
         return $tenant->forceDelete();
     }
 
diff --git a/resources/views/tenants/edit.blade.php b/resources/views/tenants/edit.blade.php
index 6e5ae4b0..c1b6c169 100644
--- a/resources/views/tenants/edit.blade.php
+++ b/resources/views/tenants/edit.blade.php
@@ -15,9 +15,13 @@
     <!-- 폼 영역 -->
     <div class="bg-white rounded-lg shadow-sm p-6">
         <form id="tenantForm"
-              hx-put="/api/admin/tenants/{{ $tenant->id }}"
+              action="/api/admin/tenants/{{ $tenant->id }}"
+              method="POST"
+              hx-put="{{ url('/api/admin/tenants/' . $tenant->id) }}"
               hx-headers='{"X-CSRF-TOKEN": "{{ csrf_token() }}"}'
               hx-swap="none">
+            @method('PUT')
+            @csrf
 
             <!-- 기본 정보 -->
             <div class="mb-8">
@@ -186,7 +190,6 @@ class="px-6 py-2 bg-blue-600 hover:bg-blue-700 text-white rounded-lg transition"
 @endsection
 
 @push('scripts')
-<script src="https://unpkg.com/htmx.org@1.9.10"></script>
 <script>
     // HTMX 응답 처리
     document.body.addEventListener('htmx:afterRequest', function(event) {
diff --git a/resources/views/tenants/index.blade.php b/resources/views/tenants/index.blade.php
index 2cf364db..8d4cc52e 100644
--- a/resources/views/tenants/index.blade.php
+++ b/resources/views/tenants/index.blade.php
@@ -90,7 +90,10 @@ class="bg-white rounded-lg shadow-sm overflow-hidden">
         if (confirm(`"${name}" 테넌트를 삭제하시겠습니까?`)) {
             htmx.ajax('DELETE', `/api/admin/tenants/${id}`, {
                 target: '#tenant-table',
-                swap: 'none'
+                swap: 'none',
+                headers: {
+                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                }
             }).then(() => {
                 htmx.trigger('#tenant-table', 'filterSubmit');
             });
@@ -102,7 +105,25 @@ class="bg-white rounded-lg shadow-sm overflow-hidden">
         if (confirm(`"${name}" 테넌트를 복원하시겠습니까?`)) {
             htmx.ajax('POST', `/api/admin/tenants/${id}/restore`, {
                 target: '#tenant-table',
-                swap: 'none'
+                swap: 'none',
+                headers: {
+                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                }
+            }).then(() => {
+                htmx.trigger('#tenant-table', 'filterSubmit');
+            });
+        }
+    };
+
+    // 영구삭제 확인
+    window.confirmForceDelete = function(id, name) {
+        if (confirm(`"${name}" 테넌트를 영구 삭제하시겠습니까?\n\n⚠️ 이 작업은 되돌릴 수 없습니다!`)) {
+            htmx.ajax('DELETE', `/api/admin/tenants/${id}/force`, {
+                target: '#tenant-table',
+                swap: 'none',
+                headers: {
+                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                }
             }).then(() => {
                 htmx.trigger('#tenant-table', 'filterSubmit');
             });