diff --git a/src/lib/stores/fuel-log.svelte.ts b/src/lib/stores/fuel-log.svelte.ts
index 433d808..d1d3d6b 100644
--- a/src/lib/stores/fuel-log.svelte.ts
+++ b/src/lib/stores/fuel-log.svelte.ts
@@ -16,7 +16,11 @@ class FuelLogStore {
 			.get<ApiResponse>(`/vehicles/${vehicleStore.selectedId}/fuel-logs`)
 			.then(({ data: res }) => {
 				const logs: FuelLog[] = res.data;
-				logs.sort((a, b) => compareDesc(a.date, b.date));
+				logs.sort((a, b) => {
+					const dateDiff = compareDesc(a.date, b.date);
+					if (dateDiff !== 0) return dateDiff;
+					return (b.odometer ?? 0) - (a.odometer ?? 0);
+				});
 				this.fuelLogs = logs;
 				this.error = undefined;
 			})
diff --git a/src/lib/stores/maintenance.svelte.ts b/src/lib/stores/maintenance.svelte.ts
index 727034e..98cad7b 100644
--- a/src/lib/stores/maintenance.svelte.ts
+++ b/src/lib/stores/maintenance.svelte.ts
@@ -1,6 +1,7 @@
 import type { FuelLog, MaintenanceLog } from '$lib/domain';
 import { apiClient } from '$lib/helper/api.helper';
 import type { ApiResponse } from '$lib/response';
+import { compareDesc } from 'date-fns';
 import { vehicleStore } from './vehicle.svelte';
 
 class MaintenanceStore {
@@ -15,6 +16,11 @@ class MaintenanceStore {
 			.get<ApiResponse>(`/vehicles/${vehicleStore.selectedId}/maintenance-logs`)
 			.then(({ data: res }) => {
 				const logs: MaintenanceLog[] = res.data;
+				logs.sort((a, b) => {
+					const dateDiff = compareDesc(a.date, b.date);
+					if (dateDiff !== 0) return dateDiff;
+					return b.odometer - a.odometer;
+				});
 				this.maintenanceLogs = logs;
 				this.error = undefined;
 			})