diff --git a/frontend/src/routes/settings/content/+page.server.ts b/frontend/src/routes/settings/content/+page.server.ts
index 64e7cba7..4eafebe3 100644
--- a/frontend/src/routes/settings/content/+page.server.ts
+++ b/frontend/src/routes/settings/content/+page.server.ts
@@ -57,17 +57,17 @@ export const actions: Actions = {
 
 			const save = await saveSettings(event.fetch);
 			const load = await loadSettings(event.fetch);
-
-			if (event.url.searchParams.get('onboarding') === 'true') {
-				redirect(302, '/onboarding/4');
-			}
-
-			return message(form, 'Settings saved!');
 		} catch (e) {
 			console.error(e);
 			return message(form, 'Unable to save settings. API is down.', {
 				status: 400
 			});
 		}
+
+		if (event.url.searchParams.get('onboarding') === 'true') {
+			redirect(302, '/onboarding/4');
+		}
+
+		return message(form, 'Settings saved!');
 	}
 };
diff --git a/frontend/src/routes/settings/general/+page.server.ts b/frontend/src/routes/settings/general/+page.server.ts
index ca87a842..eb6fa2e0 100644
--- a/frontend/src/routes/settings/general/+page.server.ts
+++ b/frontend/src/routes/settings/general/+page.server.ts
@@ -56,20 +56,19 @@ export const actions: Actions = {
 					}
 				);
 			}
-
 			const save = await saveSettings(event.fetch);
 			const load = await loadSettings(event.fetch);
-
-			if (event.url.searchParams.get('onboarding') === 'true') {
-				redirect(302, '/onboarding/2');
-			}
-
-			return message(form, 'Settings saved!');
 		} catch (e) {
 			console.error(e);
 			return message(form, 'Unable to save settings. API is down.', {
 				status: 400
 			});
 		}
+
+		if (event.url.searchParams.get('onboarding') === 'true') {
+			redirect(302, '/onboarding/2');
+		}
+
+		return message(form, 'Settings saved!');
 	}
 };
diff --git a/frontend/src/routes/settings/mediaserver/+page.server.ts b/frontend/src/routes/settings/mediaserver/+page.server.ts
index 7015496d..bd3a796d 100644
--- a/frontend/src/routes/settings/mediaserver/+page.server.ts
+++ b/frontend/src/routes/settings/mediaserver/+page.server.ts
@@ -57,17 +57,17 @@ export const actions: Actions = {
 
 			const save = await saveSettings(event.fetch);
 			const load = await loadSettings(event.fetch);
-
-			if (event.url.searchParams.get('onboarding') === 'true') {
-				redirect(302, '/onboarding/3');
-			}
-
-			return message(form, 'Settings saved!');
 		} catch (e) {
 			console.error(e);
 			return message(form, 'Unable to save settings. API is down.', {
 				status: 400
 			});
 		}
+
+		if (event.url.searchParams.get('onboarding') === 'true') {
+			redirect(302, '/onboarding/3');
+		}
+
+		return message(form, 'Settings saved!');
 	}
 };
diff --git a/frontend/src/routes/settings/scrapers/+page.server.ts b/frontend/src/routes/settings/scrapers/+page.server.ts
index 872338ed..f838fd16 100644
--- a/frontend/src/routes/settings/scrapers/+page.server.ts
+++ b/frontend/src/routes/settings/scrapers/+page.server.ts
@@ -57,17 +57,17 @@ export const actions: Actions = {
 
 			const save = await saveSettings(event.fetch);
 			const load = await loadSettings(event.fetch);
-
-			if (event.url.searchParams.get('onboarding') === 'true') {
-				redirect(302, '/?onboarding=true');
-			}
-
-			return message(form, 'Settings saved!');
 		} catch (e) {
 			console.error(e);
 			return message(form, 'Unable to save settings. API is down.', {
 				status: 400
 			});
 		}
+
+		if (event.url.searchParams.get('onboarding') === 'true') {
+			redirect(302, '/?onboarding=true');
+		}
+
+		return message(form, 'Settings saved!');
 	}
 };