diff --git a/packages/components/src/components/DataTableSkeleton/DataTableSkeleton.jsx b/packages/components/src/components/DataTableSkeleton/DataTableSkeleton.jsx
new file mode 100644
index 000000000..1d02f5176
--- /dev/null
+++ b/packages/components/src/components/DataTableSkeleton/DataTableSkeleton.jsx
@@ -0,0 +1,97 @@
+/*
+Copyright 2024 The Tekton Authors
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { usePrefix } from '@carbon/react';
+import { classNames } from '@tektoncd/dashboard-utils';
+
+export default function DataTableSkeleton({
+  filters,
+  headers,
+  rowCount = 5,
+  columnCount = 5,
+  compact = false,
+  className,
+  showDescription,
+  showHeader = true,
+  showToolbar = true,
+  size,
+  ...rest
+}) {
+  const prefix = usePrefix();
+
+  const dataTableSkeletonClasses = classNames(className, {
+    [`${prefix}--skeleton`]: true,
+    [`${prefix}--data-table`]: true,
+    [`${prefix}--data-table--compact`]: compact,
+    [`${prefix}--data-table--${size}`]: true
+  });
+
+  const rows = Array(rowCount);
+  const columnsArray = Array.from({ length: columnCount }, (_, index) => index);
+  for (let i = 0; i < rowCount; i += 1) {
+    rows[i] = (
+      <tr key={i}>
+        {columnsArray.map(j => (
+          <td key={j}>
+            <span />
+          </td>
+        ))}
+      </tr>
+    );
+  }
+
+  return (
+    <div className={`${prefix}--skeleton ${prefix}--data-table-container`}>
+      {showHeader ? (
+        <div className={`${prefix}--data-table-header`}>
+          <div className={`${prefix}--data-table-header__title`} />
+          {showDescription && (
+            <div className={`${prefix}--data-table-header__description`} />
+          )}
+        </div>
+      ) : null}
+      {showToolbar ? (
+        <section
+          aria-label="data table toolbar"
+          className={`${prefix}--table-toolbar`}
+        >
+          <div className={`${prefix}--toolbar-content`}>
+            {filters || (
+              <span
+                className={`${prefix}--skeleton ${prefix}--btn ${prefix}--btn--sm`}
+              />
+            )}
+          </div>
+        </section>
+      ) : null}
+      <table className={dataTableSkeletonClasses} {...rest}>
+        <thead>
+          <tr>
+            {columnsArray.map(i => (
+              <th key={i}>
+                {headers ? (
+                  <div className={`${prefix}--table-header-label`}>
+                    {headers[i]?.header}
+                  </div>
+                ) : (
+                  <span />
+                )}
+              </th>
+            ))}
+          </tr>
+        </thead>
+        <tbody>{rows}</tbody>
+      </table>
+    </div>
+  );
+}
diff --git a/packages/components/src/components/DataTableSkeleton/index.js b/packages/components/src/components/DataTableSkeleton/index.js
new file mode 100644
index 000000000..e6964f5fc
--- /dev/null
+++ b/packages/components/src/components/DataTableSkeleton/index.js
@@ -0,0 +1,15 @@
+/*
+Copyright 2024 The Tekton Authors
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+/* istanbul ignore file */
+
+export { default } from './DataTableSkeleton';
diff --git a/packages/components/src/components/Table/Table.jsx b/packages/components/src/components/Table/Table.jsx
index ba692ba52..9ee21da76 100644
--- a/packages/components/src/components/Table/Table.jsx
+++ b/packages/components/src/components/Table/Table.jsx
@@ -16,17 +16,17 @@ import PropTypes from 'prop-types';
 import {
   Button,
   DataTable,
-  DataTableSkeleton,
   TableBatchAction,
   TableBatchActions,
   TableSelectAll,
   TableSelectRow,
   TableToolbar,
-  TableToolbarContent,
-  usePrefix
+  TableToolbarContent
 } from '@carbon/react';
 import { ALL_NAMESPACES, classNames } from '@tektoncd/dashboard-utils';
 
+import DataTableSkeleton from '../DataTableSkeleton';
+
 const {
   TableContainer,
   Table: CarbonTable,
@@ -138,7 +138,6 @@ const Table = ({
   title = null,
   toolbarButtons = defaults.toolbarButtons
 }) => {
-  const carbonPrefix = usePrefix();
   const intl = useIntl();
   const shouldRenderBatchActions = !!(
     dataRows.length && batchActionButtons.length
@@ -157,20 +156,12 @@ const Table = ({
   });
 
   if (loading) {
-    const tableSizeClassNames = {
-      xs: `${carbonPrefix}--data-table--xs`,
-      sm: `${carbonPrefix}--data-table--sm`,
-      md: `${carbonPrefix}--data-table--md`,
-      lg: `${carbonPrefix}--data-table--lg`,
-      xl: `${carbonPrefix}--data-table--xl`
-    };
-
     return (
       <div className={tableClassNames} id={id}>
         <DataTableSkeleton
           aria-label={title}
-          className={tableSizeClassNames[size]}
           columnCount={dataHeaders.length}
+          filters={filters}
           headers={dataHeaders}
           rowCount={skeletonRowCount}
           showHeader={!!title}
diff --git a/packages/components/src/components/Table/Table.stories.jsx b/packages/components/src/components/Table/Table.stories.jsx
index 8bf03966b..54e3d99f7 100644
--- a/packages/components/src/components/Table/Table.stories.jsx
+++ b/packages/components/src/components/Table/Table.stories.jsx
@@ -152,3 +152,23 @@ export const Filters = {
     notes: 'table with filters'
   }
 };
+
+export const Loading = {
+  args: {
+    ...ToolbarButton.args,
+    loading: true
+  },
+  parameters: {
+    notes: 'table loading state'
+  }
+};
+
+export const LoadingWithFilters = {
+  args: {
+    ...Filters.args,
+    loading: true
+  },
+  parameters: {
+    notes: 'table loading state with filters'
+  }
+};
diff --git a/packages/components/src/components/Table/_Table.scss b/packages/components/src/components/Table/_Table.scss
index 94dcb7dda..127ca36ab 100644
--- a/packages/components/src/components/Table/_Table.scss
+++ b/packages/components/src/components/Table/_Table.scss
@@ -134,6 +134,10 @@ limitations under the License.
   &.tkn--table-with-filters {
     .#{$prefix}--data-table-container {
       overflow: visible;
+
+      &.#{$prefix}--skeleton .#{$prefix}--toolbar-content {
+        justify-content: flex-start;
+      }
     }
 
     .#{$prefix}--table-toolbar {
diff --git a/packages/components/src/components/index.js b/packages/components/src/components/index.js
index 195e2dce8..28d1fcd32 100644
--- a/packages/components/src/components/index.js
+++ b/packages/components/src/components/index.js
@@ -14,6 +14,7 @@ limitations under the License.
 
 export { default as ActionableNotification } from './ActionableNotification';
 export { default as Actions } from './Actions';
+export { default as DataTableSkeleton } from './DataTableSkeleton';
 export { default as DetailsHeader } from './DetailsHeader';
 export { default as DeleteModal } from './DeleteModal';
 export { default as DotSpinner } from './DotSpinner';