diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c
index 1f42b1758..4b62767b1 100644
--- a/src/irc/irc-recv.c
+++ b/src/irc/irc-recv.c
@@ -883,8 +883,12 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
                 gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
             }
             gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
-            hotlist_add (2, server->buffer);
-            gui_draw_buffer_status (gui_current_window->buffer, 1);
+            if ((host) && (strcasecmp (host, "nickserv") != 0) &&
+                (strcasecmp (host, "chanserv") != 0))
+            {
+                hotlist_add (2, server->buffer);
+                gui_draw_buffer_status (gui_current_window->buffer, 1);
+            }
         }
     }
     return 0;
diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c
index 1f42b1758..4b62767b1 100644
--- a/weechat/src/irc/irc-recv.c
+++ b/weechat/src/irc/irc-recv.c
@@ -883,8 +883,12 @@ irc_cmd_recv_notice (t_irc_server *server, char *host, char *arguments)
                 gui_printf_color (server->buffer, COLOR_WIN_CHAT, ": ");
             }
             gui_printf_color (server->buffer, COLOR_WIN_CHAT, "%s\n", pos);
-            hotlist_add (2, server->buffer);
-            gui_draw_buffer_status (gui_current_window->buffer, 1);
+            if ((host) && (strcasecmp (host, "nickserv") != 0) &&
+                (strcasecmp (host, "chanserv") != 0))
+            {
+                hotlist_add (2, server->buffer);
+                gui_draw_buffer_status (gui_current_window->buffer, 1);
+            }
         }
     }
     return 0;