diff --git a/frontend/components/Maintenance/ListView.vue b/frontend/components/Maintenance/ListView.vue
new file mode 100644
index 00000000..2a9e2304
--- /dev/null
+++ b/frontend/components/Maintenance/ListView.vue
@@ -0,0 +1,204 @@
+<script setup lang="ts">
+  import { useI18n } from "vue-i18n";
+  import type { MaintenanceEntryWithDetails } from "~~/lib/api/types/data-contracts";
+  import { MaintenanceFilterStatus } from "~~/lib/api/types/data-contracts";
+  import type { StatsFormat } from "~~/components/global/StatCard/types";
+  import MdiCheck from "~icons/mdi/check";
+  import MdiDelete from "~icons/mdi/delete";
+  import MdiEdit from "~icons/mdi/edit";
+  import MdiCalendar from "~icons/mdi/calendar";
+  import MdiContentDuplicate from "~icons/mdi/content-duplicate";
+  import MaintenanceEditModal from "~~/components/Maintenance/EditModal.vue";
+
+  const maintenanceFilterStatus = ref(MaintenanceFilterStatus.MaintenanceFilterStatusScheduled);
+  const maintenanceEditModal = ref<InstanceType<typeof MaintenanceEditModal>>();
+
+  const api = useUserApi();
+  const { t } = useI18n();
+
+  const props = defineProps({
+    currentItemId: {
+      type: String,
+      default: undefined,
+    },
+  });
+
+  const { data: maintenanceDataList, refresh: refreshList } = useAsyncData(
+    async () => {
+      const { data } =
+        props.currentItemId !== undefined
+          ? await api.items.maintenance.getLog(props.currentItemId, { status: maintenanceFilterStatus.value })
+          : await api.maintenance.getAll({ status: maintenanceFilterStatus.value });
+      console.log(data);
+      return data as MaintenanceEntryWithDetails[];
+    },
+    {
+      watch: maintenanceFilterStatus,
+    }
+  );
+
+  const stats = computed(() => {
+    console.log(maintenanceDataList);
+    if (!maintenanceDataList.value) return [];
+
+    const count = maintenanceDataList.value ? maintenanceDataList.value.length || 0 : 0;
+    let total = 0;
+    maintenanceDataList.value.forEach(item => {
+      total += parseFloat(item.cost);
+    });
+
+    const average = count > 0 ? total / count : 0;
+
+    return [
+      {
+        id: "count",
+        title: t("maintenance.total_entries"),
+        value: count,
+        type: "number" as StatsFormat,
+      },
+      {
+        id: "total",
+        title: t("maintenance.total_cost"),
+        value: total,
+        type: "currency" as StatsFormat,
+      },
+      {
+        id: "average",
+        title: t("maintenance.monthly_average"),
+        value: average,
+        type: "currency" as StatsFormat,
+      },
+    ];
+  });
+</script>
+
+<template>
+  <section class="space-y-6">
+    <div class="grid grid-cols-1 gap-6 md:grid-cols-3">
+      <StatCard
+        v-for="stat in stats"
+        :key="stat.id"
+        class="stats border-l-primary block shadow-xl"
+        :title="stat.title"
+        :value="stat.value"
+        :type="stat.type"
+      />
+    </div>
+    <div class="flex">
+      <div class="btn-group">
+        <button
+          class="btn btn-sm"
+          :class="`${maintenanceFilterStatus == MaintenanceFilterStatus.MaintenanceFilterStatusScheduled ? 'btn-active' : ''}`"
+          @click="maintenanceFilterStatus = MaintenanceFilterStatus.MaintenanceFilterStatusScheduled"
+        >
+          {{ $t("maintenance.filter.scheduled") }}
+        </button>
+        <button
+          class="btn btn-sm"
+          :class="`${maintenanceFilterStatus == MaintenanceFilterStatus.MaintenanceFilterStatusCompleted ? 'btn-active' : ''}`"
+          @click="maintenanceFilterStatus = MaintenanceFilterStatus.MaintenanceFilterStatusCompleted"
+        >
+          {{ $t("maintenance.filter.completed") }}
+        </button>
+        <button
+          class="btn btn-sm"
+          :class="`${maintenanceFilterStatus == MaintenanceFilterStatus.MaintenanceFilterStatusBoth ? 'btn-active' : ''}`"
+          @click="maintenanceFilterStatus = MaintenanceFilterStatus.MaintenanceFilterStatusBoth"
+        >
+          {{ $t("maintenance.filter.both") }}
+        </button>
+
+        <BaseButton
+          v-if="props.currentItemId"
+          class="ml-auto"
+          size="sm"
+          @click="maintenanceEditModal?.openCreateModal(props.currentItemId)"
+        >
+          <template #icon>
+            <MdiPlus />
+          </template>
+          {{ $t("maintenance.list.new") }}
+        </BaseButton>
+      </div>
+    </div>
+  </section>
+  <section>
+    <!-- begin -->
+    <MaintenanceEditModal ref="maintenanceEditModal" @changed="refreshList"></MaintenanceEditModal>
+    <div class="container space-y-6">
+      <BaseCard v-for="e in maintenanceDataList" :key="e.id">
+        <BaseSectionHeader class="border-b border-b-gray-300 p-6">
+          <span class="text-base-content">
+            <span v-if="!props.currentItemId || true">
+              <NuxtLink class="hover:underline" :to="`/item/${(e as MaintenanceEntryWithDetails).itemID}`">
+                {{ (e as MaintenanceEntryWithDetails).itemName }}
+              </NuxtLink>
+              -
+            </span>
+            {{ e.name }}
+          </span>
+          <template #description>
+            <div class="flex flex-wrap gap-2">
+              <div v-if="validDate(e.completedDate)" class="badge p-3">
+                <MdiCheck class="mr-2" />
+                <DateTime :date="e.completedDate" format="human" datetime-type="date" />
+              </div>
+              <div v-else-if="validDate(e.scheduledDate)" class="badge p-3">
+                <MdiCalendar class="mr-2" />
+                <DateTime :date="e.scheduledDate" format="human" datetime-type="date" />
+              </div>
+              <div class="tooltip tooltip-primary" data-tip="Cost">
+                <div class="badge badge-primary p-3">
+                  <Currency :amount="e.cost" />
+                </div>
+              </div>
+            </div>
+          </template>
+        </BaseSectionHeader>
+        <div class="p-6">
+          <Markdown :source="e.description" />
+        </div>
+        <div class="flex justify-end gap-1 p-4">
+          <BaseButton size="sm" @click="maintenanceEditModal?.openUpdateModal(e)">
+            <template #icon>
+              <MdiEdit />
+            </template>
+            {{ $t("maintenance.list.edit") }}
+          </BaseButton>
+          <BaseButton v-if="!validDate(e.completedDate)" size="sm" @click="maintenanceEditModal?.complete(e)">
+            <template #icon>
+              <MdiCheck />
+            </template>
+            {{ $t("maintenance.list.complete") }}
+          </BaseButton>
+          <BaseButton
+            v-if="!validDate(e.completedDate)"
+            size="sm"
+            @click="maintenanceEditModal?.completeAndDuplicate(e, e.itemID)"
+          >
+            <template #icon>
+              <MdiContentDuplicate />
+            </template>
+            {{ $t("maintenance.list.complete_and_duplicate") }}
+          </BaseButton>
+          <BaseButton size="sm" @click="maintenanceEditModal?.deleteEntry(e.id)">
+            <template #icon>
+              <MdiDelete />
+            </template>
+            {{ $t("maintenance.list.delete") }}
+          </BaseButton>
+        </div>
+      </BaseCard>
+      <div v-if="props.currentItemId" class="hidden first:block">
+        <button
+          type="button"
+          class="border-base-content relative block w-full rounded-lg border-2 border-dashed p-12 text-center"
+          @click="maintenanceEditModal?.openCreateModal(props.currentItemId)"
+        >
+          <MdiWrenchClock class="inline size-16" />
+          <span class="mt-2 block text-sm font-medium text-gray-900"> {{ $t("maintenance.list.create_first") }} </span>
+        </button>
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/frontend/lib/api/classes/items.ts b/frontend/lib/api/classes/items.ts
index b5491376..dde6cc5b 100644
--- a/frontend/lib/api/classes/items.ts
+++ b/frontend/lib/api/classes/items.ts
@@ -10,9 +10,9 @@ import type {
   ItemUpdate,
   MaintenanceEntry,
   MaintenanceEntryCreate,
-  MaintenanceLog,
 } from "../types/data-contracts";
 import type { AttachmentTypes, PaginationResult } from "../types/non-generated";
+import type { MaintenanceFilters } from "./maintenance.ts";
 import type { Requests } from "~~/lib/requests";
 
 export type ItemsQuery = {
@@ -65,14 +65,11 @@ export class FieldsAPI extends BaseAPI {
   }
 }
 
-type MaintenanceEntryQuery = {
-  scheduled?: boolean;
-  completed?: boolean;
-};
-
 export class ItemMaintenanceAPI extends BaseAPI {
-  getLog(itemId: string, q: MaintenanceEntryQuery = {}) {
-    return this.http.get<MaintenanceLog>({ url: route(`/items/${itemId}/maintenance`, q) });
+  getLog(itemId: string, filters: MaintenanceFilters = {}) {
+    return this.http.get<MaintenanceEntry[]>({
+      url: route(`/items/${itemId}/maintenance`, { status: filters.status?.toString() }),
+    });
   }
 
   create(itemId: string, data: MaintenanceEntryCreate) {
diff --git a/frontend/pages/item/[id]/index/maintenance.vue b/frontend/pages/item/[id]/index/maintenance.vue
index 29172293..21088852 100644
--- a/frontend/pages/item/[id]/index/maintenance.vue
+++ b/frontend/pages/item/[id]/index/maintenance.vue
@@ -1,158 +1,13 @@
 <script setup lang="ts">
-  import { useI18n } from "vue-i18n";
-  import type { StatsFormat } from "~~/components/global/StatCard/types";
   import type { ItemOut } from "~~/lib/api/types/data-contracts";
-  import MdiPlus from "~icons/mdi/plus";
-  import MdiCheck from "~icons/mdi/check";
-  import MdiDelete from "~icons/mdi/delete";
-  import MdiEdit from "~icons/mdi/edit";
-  import MdiCalendar from "~icons/mdi/calendar";
-  import MdiWrenchClock from "~icons/mdi/wrench-clock";
-  import MaintenanceEditModal from "~~/components/Maintenance/EditModal.vue";
 
-  const { t } = useI18n();
   const props = defineProps<{
     item: ItemOut;
   }>();
-
-  const api = useUserApi();
-  const toast = useNotifier();
-
-  const scheduled = ref(true);
-
-  const maintenanceEditModal = ref<InstanceType<typeof MaintenanceEditModal>>();
-
-  watch(
-    () => scheduled.value,
-    () => {
-      refreshLog();
-    }
-  );
-
-  const { data: log, refresh: refreshLog } = useAsyncData(async () => {
-    const { data } = await api.items.maintenance.getLog(props.item.id, {
-      scheduled: scheduled.value,
-      completed: !scheduled.value,
-    });
-    return data;
-  });
-
-  const count = computed(() => {
-    if (!log.value) return 0;
-    return log.value.entries.length;
-  });
-  const stats = computed(() => {
-    if (!log.value) return [];
-
-    return [
-      {
-        id: "count",
-        title: t("maintenance.total_entries"),
-        value: count.value || 0,
-        type: "number" as StatsFormat,
-      },
-      {
-        id: "total",
-        title: t("maintenance.total_cost"),
-        value: log.value.costTotal || 0,
-        type: "currency" as StatsFormat,
-      },
-      {
-        id: "average",
-        title: t("maintenance.monthly_average"),
-        value: log.value.costAverage || 0,
-        type: "currency" as StatsFormat,
-      },
-    ];
-  });
 </script>
 
 <template>
-  <div v-if="log">
-    <MaintenanceEditModal ref="maintenanceEditModal" @changed="refreshLog"></MaintenanceEditModal>
-
-    <section class="space-y-6">
-      <div class="grid grid-cols-1 gap-6 md:grid-cols-3">
-        <StatCard
-          v-for="stat in stats"
-          :key="stat.id"
-          class="stats border-l-primary block shadow-xl"
-          :title="stat.title"
-          :value="stat.value"
-          :type="stat.type"
-        />
-      </div>
-      <div class="flex">
-        <div class="btn-group">
-          <button class="btn btn-sm" :class="`${scheduled ? 'btn-active' : ''}`" @click="scheduled = true">
-            {{ $t("maintenance.filter.scheduled") }}
-          </button>
-          <button class="btn btn-sm" :class="`${scheduled ? '' : 'btn-active'}`" @click="scheduled = false">
-            {{ $t("maintenance.filter.completed") }}
-          </button>
-        </div>
-        <BaseButton class="ml-auto" size="sm" @click="maintenanceEditModal?.openCreateModal(props.item.id)">
-          <template #icon>
-            <MdiPlus />
-          </template>
-          {{ $t("maintenance.list.new") }}
-        </BaseButton>
-      </div>
-      <div class="container space-y-6">
-        <BaseCard v-for="e in log.entries" :key="e.id">
-          <BaseSectionHeader class="border-b border-b-gray-300 p-6">
-            <span class="text-base-content">
-              {{ e.name }}
-            </span>
-            <template #description>
-              <div class="flex flex-wrap gap-2">
-                <div v-if="validDate(e.completedDate)" class="badge p-3">
-                  <MdiCheck class="mr-2" />
-                  <DateTime :date="e.completedDate" format="human" datetime-type="date" />
-                </div>
-                <div v-else-if="validDate(e.scheduledDate)" class="badge p-3">
-                  <MdiCalendar class="mr-2" />
-                  <DateTime :date="e.scheduledDate" format="human" datetime-type="date" />
-                </div>
-                <div class="tooltip tooltip-primary" data-tip="Cost">
-                  <div class="badge badge-primary p-3">
-                    <Currency :amount="e.cost" />
-                  </div>
-                </div>
-              </div>
-            </template>
-          </BaseSectionHeader>
-          <div class="p-6">
-            <Markdown :source="e.description" />
-          </div>
-          <div class="flex justify-end gap-1 p-4">
-            <BaseButton size="sm" @click="maintenanceEditModal?.openUpdateModal(e)">
-              <template #icon>
-                <MdiEdit />
-              </template>
-              {{ $t("maintenance.list.edit") }}
-            </BaseButton>
-            <BaseButton size="sm" @click="maintenanceEditModal?.deleteEntry(e.id)">
-              <template #icon>
-                <MdiDelete />
-              </template>
-              {{ $t("maintenance.list.delete") }}
-            </BaseButton>
-          </div>
-        </BaseCard>
-        <div class="hidden first:block">
-          <button
-            type="button"
-            class="border-base-content relative block w-full rounded-lg border-2 border-dashed p-12 text-center"
-            @click="maintenanceEditModal?.openCreateModal(props.item.id)"
-          >
-            <MdiWrenchClock class="inline size-16" />
-            <span class="mt-2 block text-sm font-medium text-gray-900">
-              {{ $t("maintenance.list.create_first") }}
-            </span>
-          </button>
-        </div>
-      </div>
-    </section>
-  </div>
+  <BaseContainer class="mb-6 flex flex-col gap-8">
+    <MaintenanceListView :current-item-id="props.item.id"></MaintenanceListView>
+  </BaseContainer>
 </template>
diff --git a/frontend/pages/maintenance.vue b/frontend/pages/maintenance.vue
index f566402f..4d98c95a 100644
--- a/frontend/pages/maintenance.vue
+++ b/frontend/pages/maintenance.vue
@@ -1,154 +1,10 @@
-<script setup lang="ts">
-  import { useI18n } from "vue-i18n";
-  import type { StatsFormat } from "~~/components/global/StatCard/types";
-  import { MaintenanceFilterStatus } from "~~/lib/api/types/data-contracts";
-  import MdiCheck from "~icons/mdi/check";
-  import MdiDelete from "~icons/mdi/delete";
-  import MdiEdit from "~icons/mdi/edit";
-  import MdiCalendar from "~icons/mdi/calendar";
-  import MdiContentDuplicate from "~icons/mdi/content-duplicate";
-  import MaintenanceEditModal from "~~/components/Maintenance/EditModal.vue";
-
-  const { t } = useI18n();
-
-  const api = useUserApi();
-
-  const maintenanceFilter = ref(MaintenanceFilterStatus.MaintenanceFilterStatusScheduled);
-  const maintenanceEditModal = ref<InstanceType<typeof MaintenanceEditModal>>();
-
-  const { data: maintenanceData, refresh: refreshList } = useAsyncData(
-    async () => {
-      const { data } = await api.maintenance.getAll({ status: maintenanceFilter.value });
-      console.log(data);
-      return data;
-    },
-    {
-      watch: [maintenanceFilter],
-    }
-  );
-
-  const stats = computed(() => {
-    if (!maintenanceData.value) return [];
-
-    return [
-      {
-        id: "count",
-        title: t("maintenance.total_entries"),
-        value: maintenanceData.value ? maintenanceData.value.length || 0 : 0,
-        type: "number" as StatsFormat,
-      },
-    ];
-  });
-</script>
+<script setup lang="ts"></script>
 
 <template>
   <div>
     <BaseContainer class="mb-6 flex flex-col gap-8">
       <BaseSectionHeader> {{ $t("menu.maintenance") }} </BaseSectionHeader>
-      <section class="space-y-6">
-        <div class="grid grid-cols-1 gap-6 md:grid-cols-3">
-          <StatCard
-            v-for="stat in stats"
-            :key="stat.id"
-            class="stats border-l-primary block shadow-xl"
-            :title="stat.title"
-            :value="stat.value"
-            :type="stat.type"
-          />
-        </div>
-        <div class="flex">
-          <div class="btn-group">
-            <button
-              class="btn btn-sm"
-              :class="`${maintenanceFilter == MaintenanceFilterStatus.MaintenanceFilterStatusScheduled ? 'btn-active' : ''}`"
-              @click="maintenanceFilter = MaintenanceFilterStatus.MaintenanceFilterStatusScheduled"
-            >
-              {{ $t("maintenance.filter.scheduled") }}
-            </button>
-            <button
-              class="btn btn-sm"
-              :class="`${maintenanceFilter == MaintenanceFilterStatus.MaintenanceFilterStatusCompleted ? 'btn-active' : ''}`"
-              @click="maintenanceFilter = MaintenanceFilterStatus.MaintenanceFilterStatusCompleted"
-            >
-              {{ $t("maintenance.filter.completed") }}
-            </button>
-            <button
-              class="btn btn-sm"
-              :class="`${maintenanceFilter == MaintenanceFilterStatus.MaintenanceFilterStatusBoth ? 'btn-active' : ''}`"
-              @click="maintenanceFilter = MaintenanceFilterStatus.MaintenanceFilterStatusBoth"
-            >
-              {{ $t("maintenance.filter.both") }}
-            </button>
-          </div>
-        </div>
-      </section>
-      <section>
-        <!-- begin -->
-        <MaintenanceEditModal ref="maintenanceEditModal" @changed="refreshList"></MaintenanceEditModal>
-        <div class="container space-y-6">
-          <BaseCard v-for="e in maintenanceData" :key="e.id">
-            <BaseSectionHeader class="border-b border-b-gray-300 p-6">
-              <span class="text-base-content">
-                <NuxtLink class="hover:underline" :to="`/item/${e.itemID}`">
-                  {{ e.itemName }}
-                </NuxtLink>
-                -
-                {{ e.name }}
-              </span>
-              <template #description>
-                <div class="flex flex-wrap gap-2">
-                  <div v-if="validDate(e.completedDate)" class="badge p-3">
-                    <MdiCheck class="mr-2" />
-                    <DateTime :date="e.completedDate" format="human" datetime-type="date" />
-                  </div>
-                  <div v-else-if="validDate(e.scheduledDate)" class="badge p-3">
-                    <MdiCalendar class="mr-2" />
-                    <DateTime :date="e.scheduledDate" format="human" datetime-type="date" />
-                  </div>
-                  <div class="tooltip tooltip-primary" data-tip="Cost">
-                    <div class="badge badge-primary p-3">
-                      <Currency :amount="e.cost" />
-                    </div>
-                  </div>
-                </div>
-              </template>
-            </BaseSectionHeader>
-            <div class="p-6">
-              <Markdown :source="e.description" />
-            </div>
-            <div class="flex justify-end gap-1 p-4">
-              <BaseButton size="sm" @click="maintenanceEditModal?.openUpdateModal(e)">
-                <template #icon>
-                  <MdiEdit />
-                </template>
-                {{ $t("maintenance.list.edit") }}
-              </BaseButton>
-              <BaseButton v-if="!validDate(e.completedDate)" size="sm" @click="maintenanceEditModal?.complete(e)">
-                <template #icon>
-                  <MdiCheck />
-                </template>
-                {{ $t("maintenance.list.complete") }}
-              </BaseButton>
-              <BaseButton
-                v-if="!validDate(e.completedDate)"
-                size="sm"
-                @click="maintenanceEditModal?.completeAndDuplicate(e, e.itemID)"
-              >
-                <template #icon>
-                  <MdiContentDuplicate />
-                </template>
-                {{ $t("maintenance.list.complete_and_duplicate") }}
-              </BaseButton>
-              <BaseButton size="sm" @click="maintenanceEditModal?.deleteEntry(e.id)">
-                <template #icon>
-                  <MdiDelete />
-                </template>
-                {{ $t("maintenance.list.delete") }}
-              </BaseButton>
-            </div>
-          </BaseCard>
-        </div>
-      </section>
+      <MaintenanceListView></MaintenanceListView>
     </BaseContainer>
   </div>
 </template>