diff --git a/src/runtime/components/data/Table.vue b/src/runtime/components/data/Table.vue
index 519ded3bdf..c848efc17c 100644
--- a/src/runtime/components/data/Table.vue
+++ b/src/runtime/components/data/Table.vue
@@ -35,7 +35,7 @@
         </tr>
 
         <tr v-if="loadingState && loading">
-          <td :colspan="columns.length">
+          <td :colspan="columns.length + (modelValue ? 1 : 0)">
             <slot name="loading-state">
               <div :class="ui.loadingState.wrapper">
                 <UIcon v-if="loadingState.icon" :name="loadingState.icon" :class="ui.loadingState.icon" aria-hidden="true" />
@@ -48,7 +48,7 @@
         </tr>
 
         <tr v-else-if="emptyState && !rows.length">
-          <td :colspan="columns.length">
+          <td :colspan="columns.length + (modelValue ? 1 : 0)">
             <slot name="empty-state">
               <div :class="ui.emptyState.wrapper">
                 <UIcon v-if="emptyState.icon" :name="emptyState.icon" :class="ui.emptyState.icon" aria-hidden="true" />