diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index d91a57e90..1e420a958 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -698,7 +698,7 @@ irc_cmd_send_join (t_irc_server *server, char *arguments)
 	  arguments = ++p;
 	}
       
-      if (string_is_channel (arguments))
+      if (string_is_channel (buffer))
         server_sendf (server, "JOIN %s\r\n", buffer);
       else
 	server_sendf (server, "JOIN #%s\r\n", buffer);
@@ -706,6 +706,8 @@ irc_cmd_send_join (t_irc_server *server, char *arguments)
       if (!p) break;
   }
   
+  free (buffer);
+  
   return 0;
 }
 
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index d91a57e90..1e420a958 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -698,7 +698,7 @@ irc_cmd_send_join (t_irc_server *server, char *arguments)
 	  arguments = ++p;
 	}
       
-      if (string_is_channel (arguments))
+      if (string_is_channel (buffer))
         server_sendf (server, "JOIN %s\r\n", buffer);
       else
 	server_sendf (server, "JOIN #%s\r\n", buffer);
@@ -706,6 +706,8 @@ irc_cmd_send_join (t_irc_server *server, char *arguments)
       if (!p) break;
   }
   
+  free (buffer);
+  
   return 0;
 }