diff --git a/src/main/java/testplugin/plugin/Events.java b/src/main/java/testplugin/plugin/Events.java
index 4bcd4e3..ca8557a 100644
--- a/src/main/java/testplugin/plugin/Events.java
+++ b/src/main/java/testplugin/plugin/Events.java
@@ -66,7 +66,7 @@ public class Events implements Listener {
 
         DiscordWebhook Webhook = new DiscordWebhook(webhookURL);
 
-        Webhook.setContent('<' + player.getName() + "> " + message.replaceAll("(<?[@|#]&?.+>?)","`$1`"));
+        Webhook.setContent('<' + player.getName() + "> " + message.replaceAll("(<[@#]\\S+>|@\\S+|#\\S+)","`$1`"));
 
         try {
             Webhook.execute();