diff --git a/irc/help.go b/irc/help.go
index 6f682c26..ef793c8a 100644
--- a/irc/help.go
+++ b/irc/help.go
@@ -193,10 +193,8 @@ Returns whether the given nicks exist on the network.`,
 	},
 	"join": {
 		text: `JOIN <channel>{,<channel>} [<key>{,<key>}]
-JOIN 0
 
-Joins the given channels with the matching keys, or if the only param is "0"
-parts all channels instead.`,
+Joins the given channels with the matching keys.`,
 	},
 	"kick": {
 		text: `KICK <channel> <user> [reason]
diff --git a/irc/server.go b/irc/server.go
index d82a72d6..87709353 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -905,13 +905,10 @@ func renameHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
 }
 
 // JOIN <channel>{,<channel>} [<key>{,<key>}]
-// JOIN 0
 func joinHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
-	// handle JOIN 0
+	// kill JOIN 0 requests
 	if msg.Params[0] == "0" {
-		for channel := range client.channels {
-			channel.Part(client, client.nickCasefolded)
-		}
+		client.Notice("JOIN 0 is not allowed")
 		return false
 	}