diff --git a/irc/getters.go b/irc/getters.go
index 29bc8413..5feadaa3 100644
--- a/irc/getters.go
+++ b/irc/getters.go
@@ -891,10 +891,7 @@ func (channel *Channel) GetMetadata(key string) (string, bool) {
 	defer channel.stateMutex.RUnlock()
 
 	val, ok := channel.metadata[key]
-	if !ok {
-		return "", false
-	}
-	return val, true
+	return val, ok
 }
 
 func (channel *Channel) SetMetadata(key string, value string) {
@@ -991,9 +988,5 @@ func (client *Client) CountMetadata() int {
 	client.stateMutex.RLock()
 	defer client.stateMutex.RUnlock()
 
-	if client.metadata == nil {
-		return 0
-	}
-
 	return len(client.metadata)
 }