diff --git a/include/DeviceList.h b/include/DeviceList.h
index 7aeb422a..5f376a29 100644
--- a/include/DeviceList.h
+++ b/include/DeviceList.h
@@ -13,6 +13,5 @@ extern const String getThisDevice();
 extern void addThisDeviceToList();
 extern void asyncUdpInit();
 extern String uint8tToString(uint8_t* data, size_t len);
-extern bool udpPacketValidation(String& data);
 extern void udpPacketParse(String& data);
 extern void jsonMergeArrays(String& existJson, String& incJson);
\ No newline at end of file
diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp
index 9e5d99c2..c1e398cb 100644
--- a/src/DeviceList.cpp
+++ b/src/DeviceList.cpp
@@ -37,12 +37,16 @@ void asyncUdpInit() {
             // Serial.print(", Data: ");
             // Serial.write(packet.data(), packet.length());
             String data = uint8tToString(packet.data(), packet.length());
-            // Serial.println(data);
-            if (udpPacketValidation(data)) {
-                SerialPrint("i", F("UDP"), "IP: " + packet.remoteIP().toString() + ":" + String(packet.remotePort()));
-                // Serial.println(data);
-                jsonMergeArrays(devListHeapJson, data);
-                // Serial.println(devListHeapJson);
+            String remoteWorkgroup = "";
+            data.replace("[", "");
+            data.replace("]", "");
+            if (jsonRead(data, F("wg"), remoteWorkgroup)) {    // проверяем чтоб полученный формат был Json и заодно вытягиваем имя группы
+                String loacalWorkgroup = "";
+                jsonRead(settingsFlashJson, F("wg"), loacalWorkgroup);  
+                if (remoteWorkgroup == loacalWorkgroup) {
+                    SerialPrint("i", F("UDP"), "IP: " + packet.remoteIP().toString() + ":" + String(packet.remotePort()));
+                    jsonMergeArrays(devListHeapJson, data);
+                }
             } else {
                 SerialPrint("E", F("UDP"), F("Udp packet invalid"));
             }
@@ -68,16 +72,6 @@ void asyncUdpInit() {
     SerialPrint("i", F("UDP"), F("Udp Init"));
 }
 
-bool udpPacketValidation(String& data) {
-    // SerialPrint("i", F("UDP"), data);
-    String workgroup = jsonReadStr(settingsFlashJson, "wg");
-    if (workgroup != "" && data.indexOf(workgroup) != -1) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 void jsonMergeArrays(String& existJson, String& incJson) {
     DynamicJsonDocument incJsonDoc(1024);
     DeserializationError incJsonError = deserializeJson(incJsonDoc, incJson);