diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 164941fd7..3b91cb98d 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -38,6 +38,7 @@ Bug fixes::
   * irc: display an error message when using command /dcc without xfer plugin loaded
   * irc: display ACCOUNT and CHGHOST commands in private buffers
   * irc: fix extract of isupport value when it is last in list and without value (issue #1807)
+  * irc: fix target buffer of generic errors when they contain a target nick (issue #1814)
   * guile: fix function hdata_get_string
   * javascript: fix return of long value in functions infolist_time, hdata_long and hdata_time
   * php: fix function hdata_compare
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 3724c1216..c6501521b 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -1361,14 +1361,16 @@ IRC_PROTOCOL_CALLBACK(error)
  * command "ERROR").
  *
  * Command looks like:
+ *   401 nick nick2 :No such nick/channel
+ *   402 nick server :No such server
  *   404 nick #channel :Cannot send to channel
  */
 
 IRC_PROTOCOL_CALLBACK(generic_error)
 {
     int arg_error;
-    char *str_error;
-    const char *pos_chan_nick;
+    char *str_error, str_target[512];
+    const char *pos_channel, *pos_nick;
     struct t_irc_channel *ptr_channel;
     struct t_gui_buffer *ptr_buffer;
 
@@ -1377,17 +1379,35 @@ IRC_PROTOCOL_CALLBACK(generic_error)
     arg_error = (irc_server_strcasecmp (server, params[0], server->nick) == 0) ?
         1 : 0;
 
-    pos_chan_nick = NULL;
-    if (params[arg_error + 1]
-        && irc_channel_is_channel (server, params[arg_error]))
-    {
-        pos_chan_nick = params[arg_error];
-        arg_error++;
-    }
-
+    pos_channel = NULL;
     ptr_channel = NULL;
-    if (pos_chan_nick)
-        ptr_channel = irc_channel_search (server, pos_chan_nick);
+    pos_nick = NULL;
+    str_target[0] = '\0';
+
+    if (params[arg_error + 1])
+    {
+        if (irc_channel_is_channel (server, params[arg_error]))
+        {
+            pos_channel = params[arg_error];
+            ptr_channel = irc_channel_search (server, pos_channel);
+            snprintf (str_target, sizeof (str_target),
+                      "%s%s%s: ",
+                      IRC_COLOR_CHAT_CHANNEL,
+                      pos_channel,
+                      IRC_COLOR_RESET);
+            arg_error++;
+        }
+        else if (strcmp (params[arg_error], "*") != 0)
+        {
+            pos_nick = params[arg_error];
+            snprintf (str_target, sizeof (str_target),
+                      "%s%s%s: ",
+                      irc_nick_color_for_msg (server, 1, NULL, pos_nick),
+                      pos_nick,
+                      IRC_COLOR_RESET);
+            arg_error++;
+        }
+    }
 
     ptr_buffer = (ptr_channel) ? ptr_channel->buffer : server->buffer;
 
@@ -1395,21 +1415,15 @@ IRC_PROTOCOL_CALLBACK(generic_error)
 
     weechat_printf_date_tags (
         irc_msgbuffer_get_target_buffer (
-            server, NULL, command,
+            server, pos_nick, command,
             ((strcmp (command, "401") == 0)
              || (strcmp (command, "402") == 0)) ? "whois" : NULL,
             ptr_buffer),
         date,
         irc_protocol_tags (command, tags, NULL, NULL, NULL),
-        "%s%s%s%s%s%s",
+        "%s%s%s",
         weechat_prefix ("network"),
-        (ptr_channel && pos_chan_nick
-         && (irc_server_strcasecmp (server, pos_chan_nick,
-                                    ptr_channel->name) == 0)) ?
-        IRC_COLOR_CHAT_CHANNEL : "",
-        (pos_chan_nick) ? pos_chan_nick : "",
-        IRC_COLOR_RESET,
-        (pos_chan_nick) ? ": " : "",
+        str_target,
         str_error);
 
     if (str_error)
diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp
index 8bb918c6c..d61e5168d 100644
--- a/tests/unit/plugins/irc/test-irc-protocol.cpp
+++ b/tests/unit/plugins/irc/test-irc-protocol.cpp
@@ -3715,6 +3715,71 @@ TEST(IrcProtocolWithServer, 368)
     CHECK_SRV("-- [#xyz] End of Channel Ban List");
 }
 
+/*
+ * Tests functions:
+ *   irc_protocol_cb_401 (no such nick/channel)
+ */
+
+TEST(IrcProtocolWithServer, 401)
+{
+    SRV_INIT_JOIN;
+
+    /* not enough parameters */
+    RECV(":server 401");
+    CHECK_ERROR_PARAMS("401", 0, 2);
+    RECV(":server 401 alice");
+    CHECK_ERROR_PARAMS("401", 1, 2);
+
+    RECV(":server 401 alice bob");
+    CHECK_SRV("-- bob");
+    RECV(":server 401 alice bob :No such nick/channel");
+    CHECK_SRV("-- bob: No such nick/channel");
+}
+
+/*
+ * Tests functions:
+ *   irc_protocol_cb_402 (no such server)
+ */
+
+TEST(IrcProtocolWithServer, 402)
+{
+    SRV_INIT_JOIN;
+
+    /* not enough parameters */
+    RECV(":server 402");
+    CHECK_ERROR_PARAMS("402", 0, 2);
+    RECV(":server 402 alice");
+    CHECK_ERROR_PARAMS("402", 1, 2);
+
+    RECV(":server 402 alice server");
+    CHECK_SRV("-- server");
+    RECV(":server 402 alice server :No such server");
+    CHECK_SRV("-- server: No such server");
+}
+
+/*
+ * Tests functions:
+ *   irc_protocol_cb_404 (cannot send to channel)
+ */
+
+TEST(IrcProtocolWithServer, 404)
+{
+    SRV_INIT_JOIN;
+
+    /* not enough parameters */
+    RECV(":server 404");
+    CHECK_ERROR_PARAMS("404", 0, 2);
+    RECV(":server 404 alice");
+    CHECK_ERROR_PARAMS("404", 1, 2);
+
+    RECV(":server 404 alice #test");
+    CHECK_SRV("-- #test");
+    RECV(":server 404 alice #test :Cannot send to channel");
+    CHECK_CHAN("-- #test: Cannot send to channel");
+    RECV(":server 404 alice #test2 :Cannot send to channel");
+    CHECK_SRV("-- #test2: Cannot send to channel");
+}
+
 /*
  * Tests functions:
  *   irc_protocol_cb_432 (erroneous nickname, not connected)