diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index e466aea6..1549512b 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { browser } from '$app/environment';
 	import DeviceCard from '$lib/components/DeviceCard.svelte';
 	import PageLoading from '$lib/components/PageLoading.svelte';
 	import { m } from '$lib/paraglide/messages';
@@ -25,6 +26,21 @@
 	const isMac = /Mac|iPhone|iPad/.test(navigator.userAgent);
 	const gridClass = 'grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-4';
 
+	if (browser) {
+		const storedOrderBy = localStorage.getItem('orderBy');
+		if (storedOrderBy === 'name' || storedOrderBy === 'ip') {
+			orderBy = storedOrderBy;
+		}
+		orderByGroups = localStorage.getItem('orderByGroups') !== 'false';
+	}
+
+	$: if (browser) {
+		localStorage.setItem('orderBy', orderBy);
+	}
+	$: if (browser) {
+		localStorage.setItem('orderByGroups', String(orderByGroups));
+	}
+
 	onMount(() => {});
 	const filteredDevices = () =>
 		devices.filter(