diff --git a/src/components/pages/expense/ExpenseStatusBadge.tsx b/src/components/pages/expense/ExpenseStatusBadge.tsx
index eee84224..854b4d34 100644
--- a/src/components/pages/expense/ExpenseStatusBadge.tsx
+++ b/src/components/pages/expense/ExpenseStatusBadge.tsx
@@ -49,7 +49,7 @@ const ExpenseStatusBadge = ({ approval }: ExpenseStatusBadgeProps) => {
       color={expenseStatusBadgeColor}
       text={isLatestApprovalRejected ? 'Ditolak' : (approval?.step_name ?? '')}
       className={{
-        badge: 'w-fit',
+        badge: 'whitespace-nowrap max-w-max w-fit',
       }}
     />
   );
diff --git a/src/components/pages/expense/RealizationStatusBadge.tsx b/src/components/pages/expense/RealizationStatusBadge.tsx
index d04d35c3..eb429473 100644
--- a/src/components/pages/expense/RealizationStatusBadge.tsx
+++ b/src/components/pages/expense/RealizationStatusBadge.tsx
@@ -29,7 +29,7 @@ const RealizationStatusBadge = ({ approval }: RealizationStatusBadgeProps) => {
       color={realizationStatusBadgeColor}
       text={isLatestApprovalRejected ? 'Ditolak' : realizationStatus}
       className={{
-        badge: 'w-fit',
+        badge: 'whitespace-nowrap max-w-max w-fit',
       }}
     />
   );
diff --git a/src/components/pages/marketing/MarketingTable.tsx b/src/components/pages/marketing/MarketingTable.tsx
index e09617aa..0a35a8bc 100644
--- a/src/components/pages/marketing/MarketingTable.tsx
+++ b/src/components/pages/marketing/MarketingTable.tsx
@@ -623,7 +623,10 @@ const MarketingTable = () => {
           data={allData}
           columns={columns}
           pageSize={tableFilterState.pageSize}
-          page={tableFilterState.page}
+          page={isResponseSuccess(marketing) ? marketing?.meta?.page : 1}
+          totalItems={
+            isResponseSuccess(marketing) ? marketing?.meta?.total_results : 0
+          }
           isLoading={isLoadingMarketing}
           className={{
             containerClassName: cn('p-3', {