diff --git a/telegram/formatting.go b/telegram/formatting.go
index 6c1f73aa..28726a70 100755
--- a/telegram/formatting.go
+++ b/telegram/formatting.go
@@ -134,7 +134,7 @@ func getTextLength(n *html.Node) int32 {
 	currentNode := n.FirstChild
 	for currentNode != nil {
 		if currentNode.Type == html.TextNode {
-			tagLength += utf16RuneCountInString(currentNode.Data)
+			tagLength += utf16RuneCountInString(strings.TrimSpace(currentNode.Data))
 		} else if currentNode.Type == html.ElementNode {
 			tagLength += getTextLength(currentNode)
 		}
diff --git a/telegram/updates.go b/telegram/updates.go
index 2bccbe55..8c227449 100644
--- a/telegram/updates.go
+++ b/telegram/updates.go
@@ -924,7 +924,7 @@ func (c *Client) runFilterChain(m *NewMessage, filters []Filter) bool {
 		}
 	)
 
-	if filters != nil && len(filters) > 0 {
+	if len(filters) > 0 {
 		for _, filter := range filters {
 			if filter.Private && !m.IsPrivate() || filter.Group && !m.IsGroup() || filter.Channel && !m.IsChannel() {
 				return false