diff --git a/frontend/src/FilterManager.jsx b/frontend/src/FilterManager.jsx
index d9c1f90..c66f674 100644
--- a/frontend/src/FilterManager.jsx
+++ b/frontend/src/FilterManager.jsx
@@ -806,8 +806,8 @@ function FilterManager() {
     
     const serverDns = matchedServer?.dns || matchedServer?.hostName || selectedServer.name || '';
     const serverId = matchedServer?.id || matchedServer?.ip || selectedServer.id || selectedServer.name || '';
-    const country = matchedServer?.country || '';
-    const provider = matchedServer?.provider || '';
+    const serverCountry = matchedServer?.country || '';
+    const serverProvider = matchedServer?.provider || '';
     
     const gws = [];
     
@@ -832,8 +832,8 @@ function FilterManager() {
         ip: gw.ip,
         comment: gw.description || '',
         serverDns: serverDns,
-        country: country,
-        provider: provider,
+        country: gw.country || serverCountry,
+        provider: gw.provider || serverProvider,
         primary: false // В network-config нет поля primary, но можно добавить если нужно
       });
     });
@@ -848,8 +848,8 @@ function FilterManager() {
             ip: gw.ip || '',
             comment: gw.comment || '',
             serverDns: serverDns,
-            country: country,
-            provider: provider,
+            country: gw.country || serverCountry,
+            provider: gw.provider || serverProvider,
             primary: gw.primary
           });
         }
@@ -866,8 +866,8 @@ function FilterManager() {
             ip: gw.ip || '',
             comment: gw.comment || '',
             serverDns: serverDns,
-            country: country,
-            provider: provider,
+            country: gw.country || serverCountry,
+            provider: gw.provider || serverProvider,
             primary: gw.primary
           });
         }