diff --git a/irc/channelmanager.go b/irc/channelmanager.go
index 4d7af7be..fd31b5b9 100644
--- a/irc/channelmanager.go
+++ b/irc/channelmanager.go
@@ -218,7 +218,7 @@ func (cm *ChannelManager) Rename(name string, newname string) (err error) {
 	cm.Lock()
 	defer cm.Unlock()
 
-	if cm.chans[cfnewname] != nil {
+	if cm.chans[cfnewname] != nil || cm.registeredChannels[cfnewname] {
 		return errChannelNameInUse
 	}
 	entry := cm.chans[cfname]