diff --git a/src/routes/dashboard/devices/[slug]/+page.server.ts b/src/routes/dashboard/devices/[slug]/+page.server.ts
index 00b1b1d..d710b48 100644
--- a/src/routes/dashboard/devices/[slug]/+page.server.ts
+++ b/src/routes/dashboard/devices/[slug]/+page.server.ts
@@ -84,6 +84,12 @@ export const actions = {
 		}
 
 		db.data.devices = db.data.devices.filter((d) => d.id !== params.slug);
+		db.data.users.forEach((u) => {
+			u.devices = u.devices.filter((d) => d !== params.slug);
+		});
+		db.data.groups.forEach((g) => {
+			g.devices = g.devices.filter((d) => d !== params.slug);
+		});
 		db.write();
 
 		redirect(302, '/dashboard/devices');
diff --git a/src/routes/dashboard/groups/[slug]/+page.server.ts b/src/routes/dashboard/groups/[slug]/+page.server.ts
index c1cf577..d8200c2 100644
--- a/src/routes/dashboard/groups/[slug]/+page.server.ts
+++ b/src/routes/dashboard/groups/[slug]/+page.server.ts
@@ -64,6 +64,9 @@ export const actions: Actions = {
 		}
 
 		db.data.groups = db.data.groups.filter((g) => g.id !== params.slug);
+		db.data.users.forEach((u) => {
+			u.groups = u.groups.filter((g) => g !== params.slug);
+		});
 		db.write();
 
 		redirect(302, '/dashboard/groups');