diff --git a/apps/browser/netutils/QueryClient.cpp b/apps/browser/netutils/QueryClient.cpp
index 2efc739df..39db4a1cb 100644
--- a/apps/browser/netutils/QueryClient.cpp
+++ b/apps/browser/netutils/QueryClient.cpp
@@ -41,16 +41,17 @@ QueryClient &QueryClient::Get()
 
 map<SystemAddress, QueryData> QueryClient::Query()
 {
+    status = -1;
     map<SystemAddress, QueryData> query;
     if (Connect() == IS_NOT_CONNECTED)
-    {
-        status = -1;
         return query;
-    }
 
     BitStream bs;
     bs.Write((unsigned char) (ID_MASTER_QUERY));
-    peer->Send(&bs, HIGH_PRIORITY, RELIABLE_ORDERED, CHANNEL_MASTER, masterAddr, false);
+    int code = peer->Send(&bs, HIGH_PRIORITY, RELIABLE_ORDERED, CHANNEL_MASTER, masterAddr, false);
+
+    if (code == 0)
+        return query;
 
     pmq->SetServers(&query);
     status = GetAnswer();
@@ -106,6 +107,8 @@ MASTER_PACKETS QueryClient::GetAnswer()
                     update = false;
                     id = pid;
                     break;
+                case ID_CONNECTION_REQUEST_ACCEPTED:
+                    break;
                 default:
                     break;
             }