diff --git a/app/src/main/java/com/xypower/mpremote/MainActivity.java b/app/src/main/java/com/xypower/mpremote/MainActivity.java
index 1b74d9a..49cebd3 100644
--- a/app/src/main/java/com/xypower/mpremote/MainActivity.java
+++ b/app/src/main/java/com/xypower/mpremote/MainActivity.java
@@ -117,11 +117,9 @@ public class MainActivity extends AppCompatActivity {
 
                 if (ipAddressByWifi.contains(WIFI_IP_PREFIX)) {
 
-                    String deviceId = ipAddressByWifi;
-                    int pos = deviceId.lastIndexOf(".");
-                    deviceId = deviceId.substring(pos);
-                    deviceId += ".1";
 
+                    String deviceId = Formatter.formatIpAddress(wifiManager.getDhcpInfo().gateway);
+                    
                     Socket mSocket = null;
                     try {
                         mSocket = new Socket(WIFI_IP_DEVIDE, ADB_SERVER_PORT);