diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index 12f39d6ee9b99084c091d449dc689d058d513601..2549138ddfe23aea1067a3703acb93a4f56422af 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -210,6 +210,8 @@ void IrcClient::send_join_command(const std::string& chan_name, const std::strin
 {
   if (this->welcomed == false)
     this->channels_to_join.emplace_back(chan_name, password);
+  else if (password.empty())
+    this->send_message(IrcMessage("JOIN", {chan_name}));
   else
     this->send_message(IrcMessage("JOIN", {chan_name, password}));
   this->start();