diff --git a/src/server/api/admin/general.get.ts b/src/server/api/admin/general.get.ts
index c99f77f7..075eefce 100644
--- a/src/server/api/admin/general.get.ts
+++ b/src/server/api/admin/general.get.ts
@@ -1,5 +1,4 @@
 export default definePermissionEventHandler('admin', 'any', async () => {
   const generalConfig = await Database.general.getConfig();
-  const generalConfigWithOverrides = applyGeneralOverrides(generalConfig);
-  return generalConfigWithOverrides;
+  return generalConfig;
 });
diff --git a/src/server/api/admin/general.post.ts b/src/server/api/admin/general.post.ts
index 606c73fb..414af6d7 100644
--- a/src/server/api/admin/general.post.ts
+++ b/src/server/api/admin/general.post.ts
@@ -8,9 +8,6 @@ export default definePermissionEventHandler(
       event,
       validateZod(GeneralUpdateSchema, event)
     );
-
-    // Allow all updates to be saved to database
-    // Overrides will be applied when reading/using the values
     await Database.general.update(data);
     return { success: true };
   }
diff --git a/src/server/api/admin/interface/cidr.post.ts b/src/server/api/admin/interface/cidr.post.ts
index 00bd4048..a9abcdfc 100644
--- a/src/server/api/admin/interface/cidr.post.ts
+++ b/src/server/api/admin/interface/cidr.post.ts
@@ -8,9 +8,6 @@ export default definePermissionEventHandler(
       event,
       validateZod(InterfaceCidrUpdateSchema, event)
     );
-
-    // Allow all updates to be saved to database
-    // Overrides will be applied when reading/using the values
     await Database.interfaces.updateCidr(data);
     await WireGuard.saveConfig();
     return { success: true };
diff --git a/src/server/api/admin/interface/index.get.ts b/src/server/api/admin/interface/index.get.ts
index d0ddceff..7161aecc 100644
--- a/src/server/api/admin/interface/index.get.ts
+++ b/src/server/api/admin/interface/index.get.ts
@@ -1,9 +1,8 @@
 export default definePermissionEventHandler('admin', 'any', async () => {
   const wgInterface = await Database.interfaces.get();
-  const wgInterfaceWithOverrides = applyInterfaceOverrides(wgInterface);
 
   return {
-    ...wgInterfaceWithOverrides,
+    ...wgInterface,
     privateKey: undefined,
   };
 });
diff --git a/src/server/api/admin/interface/index.post.ts b/src/server/api/admin/interface/index.post.ts
index a2658378..d6beedbe 100644
--- a/src/server/api/admin/interface/index.post.ts
+++ b/src/server/api/admin/interface/index.post.ts
@@ -8,9 +8,6 @@ export default definePermissionEventHandler(
       event,
       validateZod(InterfaceUpdateSchema, event)
     );
-
-    // Allow all updates to be saved to database
-    // Overrides will be applied when reading/using the values
     await Database.interfaces.update(data);
     await WireGuard.saveConfig();
     return { success: true };
diff --git a/src/server/api/admin/overrides.get.ts b/src/server/api/admin/overrides.get.ts
new file mode 100644
index 00000000..dda4bb8a
--- /dev/null
+++ b/src/server/api/admin/overrides.get.ts
@@ -0,0 +1,24 @@
+export default definePermissionEventHandler('admin', 'any', async () => {
+  return {
+    interface: {
+      port: WG_OVERRIDE_ENV.PORT !== undefined,
+      device: WG_OVERRIDE_ENV.DEVICE !== undefined,
+      mtu: WG_OVERRIDE_ENV.MTU !== undefined,
+      ipv4Cidr: WG_OVERRIDE_ENV.IPV4_CIDR !== undefined,
+      ipv6Cidr: WG_OVERRIDE_ENV.IPV6_CIDR !== undefined,
+    },
+    userConfig: {
+      host: WG_CLIENT_OVERRIDE_ENV.HOST !== undefined,
+      port: WG_CLIENT_OVERRIDE_ENV.CLIENT_PORT !== undefined,
+      defaultDns: WG_CLIENT_OVERRIDE_ENV.DEFAULT_DNS !== undefined,
+      defaultAllowedIps: WG_CLIENT_OVERRIDE_ENV.DEFAULT_ALLOWED_IPS !== undefined,
+      defaultMtu: WG_CLIENT_OVERRIDE_ENV.DEFAULT_MTU !== undefined,
+      defaultPersistentKeepalive: WG_CLIENT_OVERRIDE_ENV.DEFAULT_PERSISTENT_KEEPALIVE !== undefined,
+    },
+    general: {
+      sessionTimeout: WG_GENERAL_OVERRIDE_ENV.SESSION_TIMEOUT !== undefined,
+      metricsPrometheus: WG_GENERAL_OVERRIDE_ENV.METRICS_PROMETHEUS !== undefined,
+      metricsJson: WG_GENERAL_OVERRIDE_ENV.METRICS_JSON !== undefined,
+    },
+  };
+});
diff --git a/src/server/api/admin/userconfig.get.ts b/src/server/api/admin/userconfig.get.ts
index acac9086..b41a81bd 100644
--- a/src/server/api/admin/userconfig.get.ts
+++ b/src/server/api/admin/userconfig.get.ts
@@ -1,5 +1,4 @@
 export default definePermissionEventHandler('admin', 'any', async () => {
   const userConfig = await Database.userConfigs.get();
-  const userConfigWithOverrides = applyUserConfigOverrides(userConfig);
-  return userConfigWithOverrides;
+  return userConfig;
 });
diff --git a/src/server/api/admin/userconfig.post.ts b/src/server/api/admin/userconfig.post.ts
index d023c460..ff150b0c 100644
--- a/src/server/api/admin/userconfig.post.ts
+++ b/src/server/api/admin/userconfig.post.ts
@@ -8,9 +8,6 @@ export default definePermissionEventHandler(
       event,
       validateZod(UserConfigUpdateSchema, event)
     );
-
-    // Allow all updates to be saved to database
-    // Overrides will be applied when reading/using the values
     await Database.userConfigs.update(data);
     await WireGuard.saveConfig();
     return { success: true };