diff --git a/gui/src/components/settings/pages/OSCSettings.tsx b/gui/src/components/settings/pages/OSCSettings.tsx
index a2733ec648..f17c23fdaa 100644
--- a/gui/src/components/settings/pages/OSCSettings.tsx
+++ b/gui/src/components/settings/pages/OSCSettings.tsx
@@ -93,13 +93,16 @@ export function OSCSettings() {
   useRPCPacket(RpcMessage.SettingsResponse, (settings: SettingsResponseT) => {
     const formData: OSCSettingsForm = defaultValues;
     if (settings.vrcOsc) {
-      formData.vrchat.enabled = settings.vrcOsc.enabled;
-      formData.vrchat.portIn =
-        settings.vrcOsc.portIn || defaultValues.vrchat.portIn;
-      formData.vrchat.portOut =
-        settings.vrcOsc.portOut || defaultValues.vrchat.portOut;
-      formData.vrchat.trackers =
-        settings.vrcOsc.trackers || defaultValues.vrchat.trackers;
+      if (settings.vrcOsc.enabled)
+        formData.vrchat.enabled = settings.vrcOsc.enabled;
+      if (settings.vrcOsc.portIn)
+        formData.vrchat.portIn = settings.vrcOsc.portIn;
+      if (settings.vrcOsc.portOut)
+        formData.vrchat.portOut = settings.vrcOsc.portOut;
+      if (settings.vrcOsc.trackers)
+        formData.vrchat.trackers = settings.vrcOsc.trackers;
+      if (settings.vrcOsc.address)
+        formData.vrchat.address = settings.vrcOsc.address.toString();
     }
 
     reset(formData);
diff --git a/server/src/main/java/dev/slimevr/protocol/RPCHandler.java b/server/src/main/java/dev/slimevr/protocol/RPCHandler.java
index 1698ba892f..f57410aee2 100644
--- a/server/src/main/java/dev/slimevr/protocol/RPCHandler.java
+++ b/server/src/main/java/dev/slimevr/protocol/RPCHandler.java
@@ -439,9 +439,6 @@ public void onChangeSettingsRequest(GenericConnection conn, RpcMessageHeader mes
 					.getFilters();
 				filtersConfig.setType(type.configKey);
 				filtersConfig.setAmount(req.filtering().amount());
-
-				this.api.server.getConfigManager().saveConfig();
-
 				filtersConfig.updateTrackersFilters();
 			}
 		}
@@ -582,11 +579,10 @@ public void onChangeSettingsRequest(GenericConnection conn, RpcMessageHeader mes
 						);
 				}
 			}
-
 			cfg.save();
-			this.api.server.getConfigManager().saveConfig();
 		}
 
+		this.api.server.getConfigManager().saveConfig();
 	}
 
 	@Override