diff --git a/apps/frontend/src/ui/hooks/useSettings.tsx b/apps/frontend/src/ui/hooks/useSettings.tsx
index e817f5c5..633af419 100644
--- a/apps/frontend/src/ui/hooks/useSettings.tsx
+++ b/apps/frontend/src/ui/hooks/useSettings.tsx
@@ -67,8 +67,6 @@ export function useSettings() {
 	if (!context)
 		throw new Error('useSettingsContext should be called inside its SettingsProvider');
 
-	context.refetch();
-
 	return context;
 }
 
diff --git a/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx b/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx
index 29412c76..d58bb81a 100644
--- a/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx
+++ b/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx
@@ -25,7 +25,7 @@ function ClusterSettings() {
 }
 
 function PageSettings(cluster: Accessor<Cluster>) {
-	const { settings } = useSettings();
+	const { settings, save } = useSettings();
 
 	// Game
 	const fullscreen = createSetting(cluster().force_fullscreen, settings().force_fullscreen ?? false);
@@ -68,6 +68,11 @@ function PageSettings(cluster: Accessor<Cluster>) {
 				custom_env_arguments: envVars.getRaw(),
 			},
 		}));
+
+		save({
+			...settings(),
+			java_versions: javaVersions.get(),
+		});
 	});
 
 	return (