diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java
index bb22480..d07b0e3 100644
--- a/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/BlazeSMP.java
@@ -2,7 +2,8 @@ package me.freezy.plugins.papermc.blazesmp;
 
 import lombok.Getter;
 import me.freezy.plugins.papermc.blazesmp.command.ClanCommand;
-import me.freezy.plugins.papermc.blazesmp.listener.JoinListener;
+import me.freezy.plugins.papermc.blazesmp.listener.PlayerChatListener;
+import me.freezy.plugins.papermc.blazesmp.listener.PlayerJoinListener;
 import me.freezy.plugins.papermc.blazesmp.module.manager.Clans;
 import me.freezy.plugins.papermc.blazesmp.module.manager.Homes;
 import me.freezy.plugins.papermc.blazesmp.module.manager.ProtectedBlocks;
@@ -64,7 +65,8 @@ public final class BlazeSMP extends JavaPlugin {
 
         this.log.info("Registering EventListeners...");
         PluginManager pm = getServer().getPluginManager();
-        pm.registerEvents(new JoinListener(), this);
+        pm.registerEvents(new PlayerJoinListener(), this);
+        pm.registerEvents(new PlayerChatListener(), this);
         this.log.info("Registered EventListeners!");
 
         this.log.info("Starting Timer tasks...");
diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java
new file mode 100644
index 0000000..e626b39
--- /dev/null
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerChatListener.java
@@ -0,0 +1,37 @@
+package me.freezy.plugins.papermc.blazesmp.listener;
+
+import io.papermc.paper.event.player.AsyncChatEvent;
+import net.kyori.adventure.text.Component;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.scoreboard.Team;
+
+public class PlayerChatListener implements Listener {
+    @EventHandler
+    public void onChat(AsyncChatEvent event) {
+        Player player = event.getPlayer();
+        Team team = player.getScoreboard().getEntryTeam(player.getName());
+
+        Component prefix = Component.empty();
+        Component suffix = Component.empty();
+
+        if (team != null) {
+            team.prefix();
+            prefix = team.prefix();
+            team.suffix();
+            suffix = team.suffix();
+        }
+
+        Component messageComponent = event.message();
+
+        Component chatComponent = Component.empty()
+                .append(prefix)
+                .append(Component.text(player.getName()))
+                .append(suffix)
+                .append(Component.text(": "))
+                .append(messageComponent);
+
+        event.renderer((source, sourceDisplayName, msg, viewer) -> chatComponent);
+    }
+}
diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/JoinListener.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerJoinListener.java
similarity index 89%
rename from src/main/java/me/freezy/plugins/papermc/blazesmp/listener/JoinListener.java
rename to src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerJoinListener.java
index 0b378dc..ba2ab6a 100644
--- a/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/JoinListener.java
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/listener/PlayerJoinListener.java
@@ -6,7 +6,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-public class JoinListener implements Listener {
+public class PlayerJoinListener implements Listener {
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();