diff --git a/irc/channel.go b/irc/channel.go
index 2b4e4d3b..a9b45861 100644
--- a/irc/channel.go
+++ b/irc/channel.go
@@ -145,10 +145,8 @@ func (channel *Channel) Join(client *Client, key string) {
 
 	client.channels.Add(channel)
 	channel.members.Add(client)
-	if len(channel.members) == 1 {
-		if !channel.flags[Persistent] {
-			channel.members[client][ChannelCreator] = true
-		}
+	if !channel.flags[Persistent] && (len(channel.members) == 1) {
+		channel.members[client][ChannelCreator] = true
 		channel.members[client][ChannelOperator] = true
 	}