diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 825de79a7..65873cf79 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -35,6 +35,7 @@ Bug fixes::
   * core: replace newlines by spaces in argument "completion" of function hook_command (issue #538)
   * core: replace char "," by "~" in color codes to separate foreground from background (issue #1264)
   * alias: remove default aliases /AME and /AMSG (issue #1355)
+  * irc: fix memory leak when removing a server
   * irc: fix length of user/nick/host in split of messages (issue #1387)
   * irc: quote NICK command argument sent to the server only if there's a ":" in the nick (issue #1376, issue #1319)
   * irc: return all arguments in the PONG response to a PING (issue #1369)
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 7b1945bc4..1b3737b99 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -1913,6 +1913,10 @@ irc_server_free_data (struct t_irc_server *server)
         free (server->nick_modes);
     if (server->host)
         free (server->host);
+    if (server->cap_ls)
+        weechat_hashtable_free (server->cap_ls);
+    if (server->cap_list)
+        weechat_hashtable_free (server->cap_list);
     if (server->isupport)
         free (server->isupport);
     if (server->prefix_modes)