diff --git a/src/components/pages/production/project-flock/ProjectFlockTable.tsx b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
index 3b134133..14378852 100644
--- a/src/components/pages/production/project-flock/ProjectFlockTable.tsx
+++ b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
@@ -32,6 +32,7 @@ import StatusBadge from '@/components/helper/StatusBadge';
 import PopoverButton from '@/components/popover/PopoverButton';
 import PopoverContent from '@/components/popover/PopoverContent';
 import ProjectFlockConfirmationModal from './ProjectFlockConfirmationModal';
+import ProjectFlockTableSkeleton from '@/components/pages/production/project-flock/skeleton/ProjectFlockTableSkeleton';
 import { useProjectFlockStore } from '@/stores/production/project-flock/project-flock.store';
 import { ProjectFlockFormValues } from './form/ProjectFlockForm.schema';
 import { useChickinStore } from '@/stores/production/chickin/chickin.store';
@@ -997,46 +998,69 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
             </div>
           </div>
 
-          <Table<ProjectFlock>
-            data={isResponseSuccess(projectFlocks) ? projectFlocks?.data : []}
-            columns={columns}
-            pageSize={tableFilterState.pageSize}
-            page={
-              isResponseSuccess(projectFlocks) ? projectFlocks?.meta?.page : 0
-            }
-            totalItems={
-              isResponseSuccess(projectFlocks)
-                ? projectFlocks?.meta?.total_results
-                : 0
-            }
-            onPageChange={(page) => {
-              setPage(page);
-            }}
-            onPageSizeChange={(pageSize) => {
-              setPageSize(pageSize);
-            }}
-            isLoading={isLoading}
-            sorting={sorting}
-            setSorting={setSorting}
-            rowSelection={rowSelection}
-            setRowSelection={setRowSelection}
-            enableRowSelection={(row) => {
-              const projectFlock = row.original;
-              return (
-                projectFlock.approval?.step_number === 1 &&
-                projectFlock.approval?.action !== 'REJECTED'
-              );
-            }}
-            withCheckbox
-            className={{
-              containerClassName: cn('p-3', {
-                'w-full mb-20':
-                  isResponseSuccess(projectFlocks) &&
-                  projectFlocks?.data?.length === 0,
-              }),
-              headerColumnClassName: 'text-nowrap',
-            }}
-          />
+          <div className='flex flex-col mb-4'>
+            {isLoading ? (
+              <div className='w-full flex flex-row justify-center items-center p-4'>
+                <span className='loading loading-spinner loading-xl' />
+              </div>
+            ) : !isResponseSuccess(projectFlocks) ||
+              projectFlocks.data?.length === 0 ? (
+              <div className='p-3'>
+                <ProjectFlockTableSkeleton
+                  columns={columns}
+                  icon={
+                    <Icon
+                      icon='heroicons:document-text'
+                      className='text-white'
+                      width={20}
+                      height={20}
+                    />
+                  }
+                />
+              </div>
+            ) : (
+              <Table<ProjectFlock>
+                data={
+                  isResponseSuccess(projectFlocks) ? projectFlocks?.data : []
+                }
+                columns={columns}
+                pageSize={tableFilterState.pageSize}
+                page={
+                  isResponseSuccess(projectFlocks)
+                    ? projectFlocks?.meta?.page
+                    : 0
+                }
+                totalItems={
+                  isResponseSuccess(projectFlocks)
+                    ? projectFlocks?.meta?.total_results
+                    : 0
+                }
+                onPageChange={(page) => {
+                  setPage(page);
+                }}
+                onPageSizeChange={(pageSize) => {
+                  setPageSize(pageSize);
+                }}
+                isLoading={isLoading}
+                sorting={sorting}
+                setSorting={setSorting}
+                rowSelection={rowSelection}
+                setRowSelection={setRowSelection}
+                enableRowSelection={(row) => {
+                  const projectFlock = row.original;
+                  return (
+                    projectFlock.approval?.step_number === 1 &&
+                    projectFlock.approval?.action !== 'REJECTED'
+                  );
+                }}
+                withCheckbox
+                className={{
+                  containerClassName: cn('p-3 mb-0'),
+                  headerColumnClassName: 'text-nowrap',
+                }}
+              />
+            )}
+          </div>
         </div>
       </div>
 
diff --git a/src/components/pages/production/project-flock/skeleton/ProjectFlockTableSkeleton.tsx b/src/components/pages/production/project-flock/skeleton/ProjectFlockTableSkeleton.tsx
new file mode 100644
index 00000000..9fe74cb8
--- /dev/null
+++ b/src/components/pages/production/project-flock/skeleton/ProjectFlockTableSkeleton.tsx
@@ -0,0 +1,37 @@
+import DataStateSkeleton from '@/components/helper/skeleton/DataStateSkeleton';
+import Table from '@/components/Table';
+import { ProjectFlock } from '@/types/api/production/project-flock';
+import { ColumnDef } from '@tanstack/react-table';
+
+const ProjectFlockTableSkeleton = ({
+  columns,
+  icon,
+  title = 'No Data Available',
+  subtitle = 'There is no project flock data displayed. Enter project flock data to get started.',
+}: {
+  columns: ColumnDef<ProjectFlock>[];
+  icon: React.ReactNode;
+  title?: string;
+  subtitle?: string;
+}) => {
+  return (
+    <div className='relative size-full'>
+      <Table
+        data={[]}
+        columns={columns}
+        isLoading={true}
+        className={{
+          skeletonCellClassName: 'animate-none w-full h-5 bg-base-content/4',
+          headerColumnClassName: 'whitespace-nowrap',
+          containerClassName: 'mb-0 overflow-hidden',
+          tableWrapperClassName: 'overflow-hidden',
+        }}
+      />
+      <div className='absolute inset-0 flex items-center justify-center'>
+        <DataStateSkeleton icon={icon} title={title} description={subtitle} />
+      </div>
+    </div>
+  );
+};
+
+export default ProjectFlockTableSkeleton;
diff --git a/src/components/pages/production/transfer-to-laying/TransferToLayingsTable.tsx b/src/components/pages/production/transfer-to-laying/TransferToLayingsTable.tsx
index 06852fe1..0b8a299f 100644
--- a/src/components/pages/production/transfer-to-laying/TransferToLayingsTable.tsx
+++ b/src/components/pages/production/transfer-to-laying/TransferToLayingsTable.tsx
@@ -22,6 +22,7 @@ import Dropdown from '@/components/Dropdown';
 import StatusBadge from '@/components/helper/StatusBadge';
 import TransferToLayingFilterModal from '@/components/pages/production/transfer-to-laying/TransferToLayingFilterModal';
 import TransferToLayingConfirmationModal from '@/components/pages/production/transfer-to-laying/TransferToLayingConfirmationModal';
+import TransferToLayingTableSkeleton from '@/components/pages/production/transfer-to-laying/skeleton/TransferToLayingTableSkeleton';
 
 import {
   TransferToLaying,
@@ -596,40 +597,61 @@ const TransferToLayingsTable = () => {
           </div>
         </div>
 
-        <Table<TransferToLaying>
-          data={
-            isResponseSuccess(transferToLayings) ? transferToLayings?.data : []
-          }
-          columns={transferToLayingsColumns}
-          pageSize={tableFilterState.pageSize}
-          page={
-            isResponseSuccess(transferToLayings)
-              ? transferToLayings?.meta?.page
-              : 0
-          }
-          totalItems={
-            isResponseSuccess(transferToLayings)
-              ? transferToLayings?.meta?.total_results
-              : 0
-          }
-          onPageChange={setPage}
-          onPageSizeChange={setPageSize}
-          isLoading={isLoading}
-          sorting={sorting}
-          setSorting={setSorting}
-          rowSelection={rowSelection}
-          setRowSelection={setRowSelection}
-          enableRowSelection={tableEnableRowSelectionHandler}
-          withCheckbox
-          className={{
-            containerClassName: cn('p-3', {
-              'w-full mb-20':
-                isResponseSuccess(transferToLayings) &&
-                transferToLayings?.data?.length === 0,
-            }),
-            headerColumnClassName: 'text-nowrap',
-          }}
-        />
+        <div className='flex flex-col mb-4'>
+          {isLoading ? (
+            <div className='w-full flex flex-row justify-center items-center p-4'>
+              <span className='loading loading-spinner loading-xl' />
+            </div>
+          ) : !isResponseSuccess(transferToLayings) ||
+            transferToLayings.data?.length === 0 ? (
+            <div className='p-3'>
+              <TransferToLayingTableSkeleton
+                columns={transferToLayingsColumns}
+                icon={
+                  <Icon
+                    icon='heroicons:document-text'
+                    className='text-white'
+                    width={20}
+                    height={20}
+                  />
+                }
+              />
+            </div>
+          ) : (
+            <Table<TransferToLaying>
+              data={
+                isResponseSuccess(transferToLayings)
+                  ? transferToLayings?.data
+                  : []
+              }
+              columns={transferToLayingsColumns}
+              pageSize={tableFilterState.pageSize}
+              page={
+                isResponseSuccess(transferToLayings)
+                  ? transferToLayings?.meta?.page
+                  : 0
+              }
+              totalItems={
+                isResponseSuccess(transferToLayings)
+                  ? transferToLayings?.meta?.total_results
+                  : 0
+              }
+              onPageChange={setPage}
+              onPageSizeChange={setPageSize}
+              isLoading={isLoading}
+              sorting={sorting}
+              setSorting={setSorting}
+              rowSelection={rowSelection}
+              setRowSelection={setRowSelection}
+              enableRowSelection={tableEnableRowSelectionHandler}
+              withCheckbox
+              className={{
+                containerClassName: cn('p-3 mb-0'),
+                headerColumnClassName: 'text-nowrap',
+              }}
+            />
+          )}
+        </div>
       </div>
 
       <TransferToLayingFilterModal
diff --git a/src/components/pages/production/transfer-to-laying/skeleton/TransferToLayingTableSkeleton.tsx b/src/components/pages/production/transfer-to-laying/skeleton/TransferToLayingTableSkeleton.tsx
new file mode 100644
index 00000000..0fe8e25c
--- /dev/null
+++ b/src/components/pages/production/transfer-to-laying/skeleton/TransferToLayingTableSkeleton.tsx
@@ -0,0 +1,37 @@
+import DataStateSkeleton from '@/components/helper/skeleton/DataStateSkeleton';
+import Table from '@/components/Table';
+import { TransferToLaying } from '@/types/api/production/transfer-to-laying';
+import { ColumnDef } from '@tanstack/react-table';
+
+const TransferToLayingTableSkeleton = ({
+  columns,
+  icon,
+  title = 'No Data Available',
+  subtitle = 'There is no transfer to laying data displayed. Enter transfer to laying data to get started.',
+}: {
+  columns: ColumnDef<TransferToLaying>[];
+  icon: React.ReactNode;
+  title?: string;
+  subtitle?: string;
+}) => {
+  return (
+    <div className='relative size-full'>
+      <Table
+        data={[]}
+        columns={columns}
+        isLoading={true}
+        className={{
+          skeletonCellClassName: 'animate-none w-full h-5 bg-base-content/4',
+          headerColumnClassName: 'whitespace-nowrap',
+          containerClassName: 'mb-0 overflow-hidden',
+          tableWrapperClassName: 'overflow-hidden',
+        }}
+      />
+      <div className='absolute inset-0 flex items-center justify-center'>
+        <DataStateSkeleton icon={icon} title={title} description={subtitle} />
+      </div>
+    </div>
+  );
+};
+
+export default TransferToLayingTableSkeleton;