diff --git a/Modules/Internal/Http/Controllers/Api/BenefitController.php b/Modules/Internal/Http/Controllers/Api/BenefitController.php
index 0d7b6f36..50f8e3e3 100644
--- a/Modules/Internal/Http/Controllers/Api/BenefitController.php
+++ b/Modules/Internal/Http/Controllers/Api/BenefitController.php
@@ -21,7 +21,7 @@ class BenefitController extends Controller
         $benefits = Benefit::query()
                     ->filter($request->all())
                     ->where('corporate_id', $corporate_id)
-                    ->paginate(0)
+                    ->paginate(999)
                     ->appends($request->all());
         
         return $benefits;
diff --git a/Modules/Internal/Services/CorporateService.php b/Modules/Internal/Services/CorporateService.php
index 44d4bf7b..3b352888 100644
--- a/Modules/Internal/Services/CorporateService.php
+++ b/Modules/Internal/Services/CorporateService.php
@@ -91,6 +91,7 @@ class CorporateService
 
             $plan = Benefit::updateOrCreate([
                 'service_code' => $benefit_data['service_code'],
+                'plan_code' => $benefit_data['plan_code'],
                 'corporate_id' => $corporate->id,
                 'code' => $benefit_data['code'],
             ], $benefit_data);
diff --git a/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx b/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx
index d39b2f1a..28aedd3e 100644
--- a/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx
@@ -422,7 +422,7 @@ export default function PlanList() {
                 ) : (
                   <TableBody>
                     {dataTableData.data.map(row => (
-                      <Row key={row.code} row={row} />
+                      <Row key={row.id} row={row} />
                     ))}
                   </TableBody>
                 )
diff --git a/frontend/dashboard/src/pages/Corporates/Plan/List.tsx b/frontend/dashboard/src/pages/Corporates/Plan/List.tsx
index b5b85660..270c8d53 100644
--- a/frontend/dashboard/src/pages/Corporates/Plan/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Plan/List.tsx
@@ -404,7 +404,7 @@ export default function CorporatePlanList() {
                 ) : (
                   <TableBody>
                     {dataTableData.data.map(row => (
-                      <Row key={row.code} row={row} />
+                      <Row key={row.id} row={row} />
                     ))}
                   </TableBody>
                 )