diff --git a/modules/coffee.go b/modules/coffee.go
index 03c51c9..4801721 100644
--- a/modules/coffee.go
+++ b/modules/coffee.go
@@ -20,7 +20,7 @@ func init() {
 }
 
 func coffeeHandleMessage(m *irc.Message) {
-	tok := strings.Split(m.Trailing, " ")
+	tok := strings.Split(strings.Trim(m.Trailing, " "), " ")
 	if len(tok) < 1 {
 		return
 	}