diff --git a/app/Http/Controllers/Api/Admin/DepartmentPermissionController.php b/app/Http/Controllers/Api/Admin/DepartmentPermissionController.php
index 3c9fe64b..562d0fb3 100644
--- a/app/Http/Controllers/Api/Admin/DepartmentPermissionController.php
+++ b/app/Http/Controllers/Api/Admin/DepartmentPermissionController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Models\Tenants\Department;
 use App\Services\DepartmentPermissionService;
 use Illuminate\Http\Request;
 
@@ -15,6 +16,28 @@ public function __construct(DepartmentPermissionService $departmentPermissionSer
         $this->departmentPermissionService = $departmentPermissionService;
     }
 
+    /**
+     * 부서의 tenant_id 조회 (세션이 'all'이거나 미선택일 때 사용)
+     */
+    protected function getEffectiveTenantId(Request $request, ?int $departmentId = null): ?int
+    {
+        $sessionTenantId = session('selected_tenant_id');
+
+        // 세션에 특정 테넌트가 선택되어 있으면 그것을 사용
+        if ($sessionTenantId && $sessionTenantId !== 'all') {
+            return (int) $sessionTenantId;
+        }
+
+        // 'all'이거나 미선택일 때는 부서의 tenant_id를 사용
+        if ($departmentId) {
+            $department = Department::find($departmentId);
+
+            return $department?->tenant_id;
+        }
+
+        return null;
+    }
+
     /**
      * 권한 매트릭스 조회 (부서 변경 시 호출)
      */
@@ -22,13 +45,15 @@ public function getMatrix(Request $request)
     {
         $departmentId = $request->input('department_id');
         $guardName = $request->input('guard_name', 'api');
-        $tenantId = session('selected_tenant_id');
 
         if (! $departmentId) {
             return view('department-permissions.partials.empty-state');
         }
 
-        // 메뉴 트리 조회
+        // 부서의 tenant_id로 메뉴 필터링
+        $tenantId = $this->getEffectiveTenantId($request, $departmentId);
+
+        // 메뉴 트리 조회 (부서의 테넌트 기준)
         $menus = $this->departmentPermissionService->getMenuTree($tenantId);
 
         // 권한 매트릭스 조회
@@ -50,7 +75,7 @@ public function toggle(Request $request)
         $menuId = $request->input('menu_id');
         $permissionType = $request->input('permission_type');
         $guardName = $request->input('guard_name', 'api');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $departmentId);
 
         $newValue = $this->departmentPermissionService->togglePermission(
             $departmentId,
@@ -78,7 +103,7 @@ public function allowAll(Request $request)
     {
         $departmentId = $request->input('department_id');
         $guardName = $request->input('guard_name', 'api');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $departmentId);
 
         $this->departmentPermissionService->allowAllPermissions($departmentId, $tenantId, $guardName);
 
@@ -100,7 +125,7 @@ public function denyAll(Request $request)
     {
         $departmentId = $request->input('department_id');
         $guardName = $request->input('guard_name', 'api');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $departmentId);
 
         $this->departmentPermissionService->denyAllPermissions($departmentId, $tenantId, $guardName);
 
@@ -122,7 +147,7 @@ public function reset(Request $request)
     {
         $departmentId = $request->input('department_id');
         $guardName = $request->input('guard_name', 'api');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $departmentId);
 
         $this->departmentPermissionService->resetToDefaultPermissions($departmentId, $tenantId, $guardName);
 
diff --git a/app/Http/Controllers/Api/Admin/RolePermissionController.php b/app/Http/Controllers/Api/Admin/RolePermissionController.php
index 3ebf4329..7335eadf 100644
--- a/app/Http/Controllers/Api/Admin/RolePermissionController.php
+++ b/app/Http/Controllers/Api/Admin/RolePermissionController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Models\Role;
 use App\Services\RolePermissionService;
 use Illuminate\Http\Request;
 
@@ -15,6 +16,28 @@ public function __construct(RolePermissionService $rolePermissionService)
         $this->rolePermissionService = $rolePermissionService;
     }
 
+    /**
+     * 역할의 tenant_id 조회 (세션이 'all'이거나 미선택일 때 사용)
+     */
+    protected function getEffectiveTenantId(Request $request, ?int $roleId = null): ?int
+    {
+        $sessionTenantId = session('selected_tenant_id');
+
+        // 세션에 특정 테넌트가 선택되어 있으면 그것을 사용
+        if ($sessionTenantId && $sessionTenantId !== 'all') {
+            return (int) $sessionTenantId;
+        }
+
+        // 'all'이거나 미선택일 때는 역할의 tenant_id를 사용
+        if ($roleId) {
+            $role = Role::find($roleId);
+
+            return $role?->tenant_id;
+        }
+
+        return null;
+    }
+
     /**
      * 권한 매트릭스 조회 (역할 변경 시 호출)
      */
@@ -22,13 +45,15 @@ public function getMatrix(Request $request)
     {
         $roleId = $request->input('role_id');
         $guardName = $request->input('guard_name', 'web');
-        $tenantId = session('selected_tenant_id');
 
         if (! $roleId) {
             return view('role-permissions.partials.empty-state');
         }
 
-        // 메뉴 트리 조회
+        // 역할의 tenant_id로 메뉴 필터링
+        $tenantId = $this->getEffectiveTenantId($request, $roleId);
+
+        // 메뉴 트리 조회 (역할의 테넌트 기준)
         $menus = $this->rolePermissionService->getMenuTree($tenantId);
 
         // 권한 매트릭스 조회
@@ -50,7 +75,7 @@ public function toggle(Request $request)
         $menuId = $request->input('menu_id');
         $permissionType = $request->input('permission_type');
         $guardName = $request->input('guard_name', 'web');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $roleId);
 
         $newValue = $this->rolePermissionService->togglePermission(
             $roleId,
@@ -78,7 +103,7 @@ public function allowAll(Request $request)
     {
         $roleId = $request->input('role_id');
         $guardName = $request->input('guard_name', 'web');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $roleId);
 
         $this->rolePermissionService->allowAllPermissions($roleId, $tenantId, $guardName);
 
@@ -100,7 +125,7 @@ public function denyAll(Request $request)
     {
         $roleId = $request->input('role_id');
         $guardName = $request->input('guard_name', 'web');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $roleId);
 
         $this->rolePermissionService->denyAllPermissions($roleId, $tenantId, $guardName);
 
@@ -122,7 +147,7 @@ public function reset(Request $request)
     {
         $roleId = $request->input('role_id');
         $guardName = $request->input('guard_name', 'web');
-        $tenantId = session('selected_tenant_id');
+        $tenantId = $this->getEffectiveTenantId($request, $roleId);
 
         $this->rolePermissionService->resetToDefaultPermissions($roleId, $tenantId, $guardName);
 
diff --git a/resources/views/department-permissions/index.blade.php b/resources/views/department-permissions/index.blade.php
index 80abef4e..e77bc88e 100644
--- a/resources/views/department-permissions/index.blade.php
+++ b/resources/views/department-permissions/index.blade.php
@@ -12,45 +12,23 @@
     <div class="bg-white rounded-lg shadow-sm mb-6">
         <div class="px-6 py-4">
             @if($departmentsByTenant)
-                {{-- 전체 테넌트 선택 시: 테넌트별 그룹핑 --}}
-                @foreach($departmentsByTenant as $tenantId => $tenantDepartments)
-                    <div class="mb-4 last:mb-0">
-                        <div class="flex items-center gap-2 mb-2">
-                            <span class="px-2 py-1 text-xs font-semibold bg-gray-100 text-gray-600 rounded">
-                                {{ $tenants[$tenantId] ?? '미지정' }}
-                            </span>
-                        </div>
-                        <div class="flex flex-wrap items-center gap-3 pl-2">
-                            @foreach($tenantDepartments as $department)
-                                <button
-                                    type="button"
-                                    class="department-button px-4 py-2 text-sm font-medium rounded-lg border transition-colors bg-white text-gray-700 border-gray-300 hover:bg-gray-50"
-                                    data-department-id="{{ $department->id }}"
-                                    data-department-name="{{ $department->name }}"
-                                    data-tenant-name="{{ $tenants[$tenantId] ?? '미지정' }}"
-                                    hx-get="/api/admin/department-permissions/matrix"
-                                    hx-target="#permission-matrix"
-                                    hx-include="[name='guard_name']"
-                                    hx-vals='{"department_id": {{ $department->id }}}'
-                                    onclick="selectDepartment(this)"
-                                >
-                                    {{ $department->name }}
-                                </button>
-                            @endforeach
-                        </div>
-                    </div>
-                @endforeach
+                {{-- 전체 테넌트 선택 시: 테넌트 선택 안내 --}}
+                <div class="text-center py-8">
+                    <div class="text-yellow-500 text-4xl mb-3">⚠️</div>
+                    <p class="text-gray-700 font-medium mb-2">테넌트를 선택해주세요</p>
+                    <p class="text-gray-500 text-sm">부서 권한을 관리하려면 상단 헤더에서 특정 테넌트를 선택해야 합니다.</p>
+                </div>
             @else
-                {{-- 특정 테넌트 선택 시: 기존 방식 --}}
+                {{-- 특정 테넌트 선택 시: firstAutoSelect 활성화 --}}
                 <div class="flex flex-wrap items-center gap-3">
                     <span class="text-sm font-medium text-gray-700">부서 선택:</span>
                     @foreach($departments as $department)
                         <button
                             type="button"
-                            class="department-button px-4 py-2 text-sm font-medium rounded-lg border transition-colors
-                                   {{ $loop->first ? 'bg-blue-700 text-white border-blue-700' : 'bg-white text-gray-700 border-gray-300 hover:bg-gray-50' }}"
+                            class="department-button px-4 py-2 text-sm font-medium rounded-lg border transition-colors bg-white text-gray-700 border-gray-300 hover:bg-gray-50"
                             data-department-id="{{ $department->id }}"
                             data-department-name="{{ $department->name }}"
+                            data-auto-select="{{ $loop->first ? 'true' : 'false' }}"
                             hx-get="/api/admin/department-permissions/matrix"
                             hx-target="#permission-matrix"
                             hx-include="[name='guard_name']"
@@ -159,14 +137,14 @@ function reloadPermissions() {
         }
     }
 
-    // 페이지 로드 시 첫 번째 부서 자동 선택
+    // 페이지 로드 시 첫 번째 부서 자동 선택 (특정 테넌트 선택 시에만)
     document.addEventListener('DOMContentLoaded', function() {
-        const firstButton = document.querySelector('.department-button');
-        if (firstButton) {
+        const autoSelectButton = document.querySelector('.department-button[data-auto-select="true"]');
+        if (autoSelectButton) {
             // onclick 핸들러 실행
-            selectDepartment(firstButton);
+            selectDepartment(autoSelectButton);
             // HTMX 이벤트 트리거
-            htmx.trigger(firstButton, 'click');
+            htmx.trigger(autoSelectButton, 'click');
         }
     });
 </script>
diff --git a/resources/views/role-permissions/index.blade.php b/resources/views/role-permissions/index.blade.php
index 096cd6ef..7444407a 100644
--- a/resources/views/role-permissions/index.blade.php
+++ b/resources/views/role-permissions/index.blade.php
@@ -12,45 +12,23 @@
     <div class="bg-white rounded-lg shadow-sm mb-6">
         <div class="px-6 py-4">
             @if($rolesByTenant)
-                {{-- 전체 테넌트 선택 시: 테넌트별 그룹핑 --}}
-                @foreach($rolesByTenant as $tenantId => $tenantRoles)
-                    <div class="mb-4 last:mb-0">
-                        <div class="flex items-center gap-2 mb-2">
-                            <span class="px-2 py-1 text-xs font-semibold bg-gray-100 text-gray-600 rounded">
-                                {{ $tenants[$tenantId] ?? '미지정' }}
-                            </span>
-                        </div>
-                        <div class="flex flex-wrap items-center gap-3 pl-2">
-                            @foreach($tenantRoles as $role)
-                                <button
-                                    type="button"
-                                    class="role-button px-4 py-2 text-sm font-medium rounded-lg border transition-colors bg-white text-gray-700 border-gray-300 hover:bg-gray-50"
-                                    data-role-id="{{ $role->id }}"
-                                    data-role-name="{{ $role->name }}"
-                                    data-tenant-name="{{ $tenants[$tenantId] ?? '미지정' }}"
-                                    hx-get="/api/admin/role-permissions/matrix"
-                                    hx-target="#permission-matrix"
-                                    hx-include="[name='guard_name']"
-                                    hx-vals='{"role_id": {{ $role->id }}}'
-                                    onclick="selectRole(this)"
-                                >
-                                    {{ $role->name }}
-                                </button>
-                            @endforeach
-                        </div>
-                    </div>
-                @endforeach
+                {{-- 전체 테넌트 선택 시: 테넌트 선택 안내 --}}
+                <div class="text-center py-8">
+                    <div class="text-yellow-500 text-4xl mb-3">⚠️</div>
+                    <p class="text-gray-700 font-medium mb-2">테넌트를 선택해주세요</p>
+                    <p class="text-gray-500 text-sm">역할 권한을 관리하려면 상단 헤더에서 특정 테넌트를 선택해야 합니다.</p>
+                </div>
             @else
-                {{-- 특정 테넌트 선택 시: 기존 방식 --}}
+                {{-- 특정 테넌트 선택 시: 기존 방식):firstAutoSelect 활성화 --}}
                 <div class="flex flex-wrap items-center gap-3">
                     <span class="text-sm font-medium text-gray-700">역할 선택:</span>
                     @foreach($roles as $role)
                         <button
                             type="button"
-                            class="role-button px-4 py-2 text-sm font-medium rounded-lg border transition-colors
-                                   {{ $loop->first ? 'bg-blue-700 text-white border-blue-700' : 'bg-white text-gray-700 border-gray-300 hover:bg-gray-50' }}"
+                            class="role-button px-4 py-2 text-sm font-medium rounded-lg border transition-colors bg-white text-gray-700 border-gray-300 hover:bg-gray-50"
                             data-role-id="{{ $role->id }}"
                             data-role-name="{{ $role->name }}"
+                            data-auto-select="{{ $loop->first ? 'true' : 'false' }}"
                             hx-get="/api/admin/role-permissions/matrix"
                             hx-target="#permission-matrix"
                             hx-include="[name='guard_name']"
@@ -159,14 +137,14 @@ function reloadPermissions() {
         }
     }
 
-    // 페이지 로드 시 첫 번째 역할 자동 선택
+    // 페이지 로드 시 첫 번째 역할 자동 선택 (특정 테넌트 선택 시에만)
     document.addEventListener('DOMContentLoaded', function() {
-        const firstButton = document.querySelector('.role-button');
-        if (firstButton) {
+        const autoSelectButton = document.querySelector('.role-button[data-auto-select="true"]');
+        if (autoSelectButton) {
             // onclick 핸들러 실행
-            selectRole(firstButton);
+            selectRole(autoSelectButton);
             // HTMX 이벤트 트리거
-            htmx.trigger(firstButton, 'click');
+            htmx.trigger(autoSelectButton, 'click');
         }
     });
 </script>