diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java b/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
index cccc4fac0..1091ba475 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
@@ -2878,8 +2878,8 @@ public class AndroidUtilities {
         String link = data.toString();
         if (link.startsWith("tg://proxy") ||
                 link.startsWith("tg://socks") ||
-                link.startsWith("https://t.me/proxy") ||
-                link.startsWith("https://t.me/socks") ||
+                link.startsWith("https://t.me/proxy?") ||
+                link.startsWith("https://t.me/socks?") ||
                 link.startsWith(VMESS_PROTOCOL) ||
                 link.startsWith(VMESS1_PROTOCOL) ||
                 link.startsWith(SS_PROTOCOL) ||
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt
index d246d9d92..8ac9727fe 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/ProxyUtil.kt
@@ -226,8 +226,8 @@ object ProxyUtil {
                 val url = link.replace("tg://", "https://t.me/").toHttpUrlOrNull()!!
 
                 AndroidUtilities.showProxyAlert(ctx,
-                        url.queryParameter("server"),
-                        url.queryParameter("port"),
+                        url.queryParameter("server") ?: return false,
+                        url.queryParameter("port") ?: return false,
                         url.queryParameter("user"),
                         url.queryParameter("pass"),
                         url.queryParameter("secret"),
@@ -476,7 +476,7 @@ object ProxyUtil {
 
             showLinkAlert(ctx, result.text)
 
-           val intArr =  arrayListOf<Int>().toIntArray()
+            val intArr = arrayListOf<Int>().toIntArray()
 
         } catch (ex: NoSuchMethodError) {