diff --git a/frontend/pages/standardEntity/[type]/index.vue b/frontend/pages/standardEntity/[type]/index.vue
index bb135e6..102aa9e 100644
--- a/frontend/pages/standardEntity/[type]/index.vue
+++ b/frontend/pages/standardEntity/[type]/index.vue
@@ -439,7 +439,7 @@ const isDistinctFilterActive = (columnKey) => {
     <UTable
         :loading="loading"
         v-model:sorting="sorting"
-        v-if="dataType && columns && items.length > 0  && !loading"
+        v-if="dataType && columns && !loading"
         :data="items"
         :columns="normalizeTableColumns(columns)"
         class="w-full"
@@ -569,22 +569,6 @@ const isDistinctFilterActive = (columnKey) => {
         <TableEmptyState :label="`Keine ${dataType.label} anzuzeigen`" />
       </template>
     </UTable>
-    <UCard
-        class="w-1/3 mx-auto mt-10"
-        v-else-if="!loading"
-    >
-      <div
-          class="flex flex-col text-center"
-      >
-        <UIcon
-            class="mx-auto w-10 h-10 mb-5"
-            name="i-heroicons-circle-stack-20-solid"/>
-        <span class="font-bold">Keine {{dataType.label}} anzuzeigen</span>
-
-      </div>
-
-
-    </UCard>
     <UProgress v-else animation="carousel" class="w-3/4 mx-auto mt-5"></UProgress>
   </div>
   <div v-else class="relative flex flex-col h-[calc(100dvh-80px)]">
@@ -681,8 +665,7 @@ const isDistinctFilterActive = (columnKey) => {
           v-if="!loading && items.length === 0"
           class="mx-auto mt-10 p-6 text-center"
       >
-        <UIcon name="i-heroicons-circle-stack-20-solid" class="mx-auto w-10 h-10 mb-3"/>
-        <p class="font-bold">Keine {{ dataType.label }} gefunden</p>
+        <TableEmptyState :label="`Keine ${dataType.label} anzuzeigen`" />
       </UCard>
 
       <div v-if="loading" class="mt-5">