diff --git a/internal/agent/ui/fyneUI/fyneUI.go b/internal/agent/ui/fyneUI/fyneUI.go
index 045b8364f..95b47dc6a 100644
--- a/internal/agent/ui/fyneUI/fyneUI.go
+++ b/internal/agent/ui/fyneUI/fyneUI.go
@@ -255,8 +255,13 @@ func (i *FyneUI) agentSettingsWindow(ctx context.Context) fyne.Window {
 		prefs.MQTTUser = mqttPrefs.User
 		prefs.MQTTPassword = mqttPrefs.Password
 
-		dialog.ShowInformation("Saved", "MQTT Preferences have been saved.", window)
-		logging.FromContext(ctx).Info("MQTT preferences saved.")
+		if err := prefs.Save(); err != nil {
+			dialog.ShowError(err, window)
+			logging.FromContext(ctx).Error("Failed to save MQTT preferences.", "error", err.Error())
+		} else {
+			dialog.ShowInformation("Saved", "MQTT Preferences have been saved. Restart agent to utilise them.", window)
+			logging.FromContext(ctx).Info("Saved MQTT preferences.")
+		}
 	}
 	settingsForm.OnCancel = func() {
 		window.Close()