diff --git a/qml/components/InlineQuery.qml b/qml/components/InlineQuery.qml
index e4714e1..0254e4a 100644
--- a/qml/components/InlineQuery.qml
+++ b/qml/components/InlineQuery.qml
@@ -27,14 +27,15 @@ Loader {
     active: userName.length > 1
     asynchronous: true
     anchors.fill: parent
-    property bool hasOverlay: active && status === Loader.Ready && item.overlay && item.overlay.status === Loader.Ready
-    property bool hasButton: active && status === Loader.Ready && item.button && item.button.status === Loader.Ready
+    property bool hasOverlay: active && userNameIsValid && status === Loader.Ready && item.overlay && item.overlay.status === Loader.Ready
+    property bool hasButton: active && userNameIsValid && status === Loader.Ready && item.button && item.button.status === Loader.Ready
 
     property int buttonPadding: hasButton ? item.button.height + Theme.paddingSmall : 0
     Behavior on buttonPadding { NumberAnimation { duration: 200} }
 
     property string chatId
     property string userName
+    property bool userNameIsValid: userName !== "" && inlineBotInformation && userName === inlineBotInformation.username
     property string query
     property int currentOffset: 0
     property string responseExtra: chatId+"|"+userName+"|"+query+"|"+currentOffset
@@ -49,7 +50,7 @@ Loader {
     onStatusChanged: {
         inlineBotInformation = null;
         if(status === Loader.Ready && userName !== "") {
-            isLoading = true;
+            isLoading = true; inlineQueryLoader.chatId
             tdLibWrapper.searchPublicChat(userName, false);
         }
     }
@@ -87,12 +88,7 @@ Loader {
         inlineQueryLoader.currentOffset = offset || 0
     }
     function request() {
-
-        if(userName.length === 0) {
-            return;
-        }
-
-        if(!inlineBotInformation) {
+        if(!inlineBotInformation || !userNameIsValid) {
             queued = true;
         } else {
             queued = false;
@@ -202,7 +198,7 @@ Loader {
                 useDelegateSize = sizeKey;
             }
             function loadMore() {
-                if(nextOffset) {
+                if(nextOffset && inlineQueryLoader.userNameIsValid) {
                     inlineQueryLoader.currentOffset = nextOffset;
                     inlineQueryLoader.request();
                 }
diff --git a/qml/js/functions.js b/qml/js/functions.js
index 4bbc8c0..db2705f 100644
--- a/qml/js/functions.js
+++ b/qml/js/functions.js
@@ -444,8 +444,10 @@ function getMessagesArrayText(messages) {
 }
 
 function handleErrorMessage(code, message) {
-    if (code === 404) {
-        // Silently ignore 404 Not Found messages (occur sometimes, without clear context...)
+    if (code === 404 || (code === 400 && message === "USERNAME_INVALID")) {
+        // Silently ignore
+        // - 404 Not Found messages (occur sometimes, without clear context...)
+        // - searchPublicChat messages for "invalid" inline queries
         return;
     }
     if (message === "USER_ALREADY_PARTICIPANT") {