diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java
index b6132b10..7eae3aa7 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java
@@ -17,6 +17,7 @@ import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
 import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
 import com.hibiscusmc.hmccosmetics.listener.PlayerGameListener;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
+import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.misc.Translation;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -120,6 +121,23 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
             throw new RuntimeException(e);
         }
 
+        // Messages setup
+        final File messagesFile = Path.of(getInstance().getDataFolder().getPath(), "messages.yml").toFile();
+        final YamlConfigurationLoader messagesLoader = YamlConfigurationLoader.
+                builder().
+                path(messagesFile.toPath()).
+                defaultOptions(opts ->
+                        opts.serializers(build -> {
+                            build.register(Location.class, LocationSerializer.INSTANCE);
+                            build.register(ItemStack.class, ItemSerializer.INSTANCE);
+                        }))
+                .build();
+        try {
+            MessagesUtil.setup(messagesLoader.load());
+        } catch (ConfigurateException e) {
+            throw new RuntimeException(e);
+        }
+
         // Translation setup
         Translation.setup();
 
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/MessagesUtil.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/MessagesUtil.java
index 533c64a7..94f761b6 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/MessagesUtil.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/MessagesUtil.java
@@ -31,7 +31,7 @@ public class MessagesUtil {
         if (!messages.containsKey(key)) return;
         if (messages.get(key).isEmpty()) return;
         String message = messages.get(key);
-        message.replaceAll("%prefix%", prefix);
+        message = message.replaceAll("%prefix%", prefix);
         Component finalMessage = Adventure.MINI_MESSAGE.deserialize(message);
         Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).player(player);
 
@@ -42,7 +42,7 @@ public class MessagesUtil {
         if (!messages.containsKey(key)) return;
         if (messages.get(key).isEmpty()) return;
         String message = messages.get(key);
-        message.replaceAll("%prefix%", prefix);
+        message = message.replaceAll("%prefix%", prefix);
         Component finalMessage = Adventure.MINI_MESSAGE.deserialize(message);
         Audience target = BukkitAudiences.create(HMCCosmeticsPlugin.getInstance()).sender(sender);