diff --git a/src/components/pages/dashboard/DashboardProduction.tsx b/src/components/pages/dashboard/DashboardProduction.tsx
index 6b3dabbd..1aeee6b0 100644
--- a/src/components/pages/dashboard/DashboardProduction.tsx
+++ b/src/components/pages/dashboard/DashboardProduction.tsx
@@ -173,8 +173,8 @@ const DashboardProduction = () => {
     loadMore: loadMoreKandang,
   } = useSelect<ProjectFlockKandang>(
     ProjectFlockKandangApi.basePath,
-    'kandang_id',
-    'kandang.name',
+    'id',
+    'name_with_period',
     'search',
     {
       location_id:
@@ -362,7 +362,7 @@ const DashboardProduction = () => {
         </div>
 
         {/* Hidden container for all charts (used for PDF export in OVERVIEW mode) */}
-        {dashboardProductionData && (
+        {exporting && dashboardProductionData && (
           <>
             {/* Export Stats Charts */}
             <div