diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index c9e1f0bb..1351c64b 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -2431,7 +2431,8 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t* const stanza, void* con
             child = xmpp_stanza_get_next(child);
         }
 
-        if (!from || !strstr(from, "@")) {
+        // Prevent repetitions by avoiding checks of disco items (from connection_set_disco_items)
+        if (from && g_strcmp0(from, connection_get_domain()) == 0) {
             _disco_autoping_warning_message(features);
         }
     }