diff --git a/lib/commands/parser.pm b/lib/commands/parser.pm
index 135691bbf3395891139343d996c271a4c4123808..4c599a891f9034304c7ebf52b1fd70d07a002546 100644
--- a/lib/commands/parser.pm
+++ b/lib/commands/parser.pm
@@ -85,8 +85,9 @@ sub exec {
 
 sub tag {
     my ($msg, $chan) = @_;
+    my @tags = ($msg =~ /#([a-zA-Z0-9_-]+)/g);
 
-    commands::tag::exec($lastID{$chan->[0]}, $msg);
+    commands::tag::exec($lastID{$chan->[0]}, "@tags");
 }
 
 1;