diff --git a/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java b/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java
index 1348682..0ca1b53 100644
--- a/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java
+++ b/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java
@@ -7,7 +7,7 @@ import java.util.Set;
 import java.util.UUID;
 import me.oskar3123.staffchat.bungee.BungeeMain;
 import me.oskar3123.staffchat.bungee.event.BungeeStaffChatEvent;
-import me.oskar3123.staffchat.bungee.util.BungeeFormatUtils;
+import me.oskar3123.staffchat.util.FormatUtils;
 import me.oskar3123.staffchat.util.Permissions;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
@@ -66,7 +66,7 @@ public class BungeeChatListener implements Listener {
     message = chatEvent.getMessage();
 
     String appliedFormat =
-        BungeeFormatUtils.replacePlaceholders(
+        FormatUtils.replacePlaceholders(
             format,
             s -> ChatColor.translateAlternateColorCodes('&', s),
             () ->
diff --git a/src/main/java/me/oskar3123/staffchat/bungee/util/BungeeFormatUtils.java b/src/main/java/me/oskar3123/staffchat/bungee/util/BungeeFormatUtils.java
deleted file mode 100644
index 48ca2a1..0000000
--- a/src/main/java/me/oskar3123/staffchat/bungee/util/BungeeFormatUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.oskar3123.staffchat.bungee.util;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-import me.oskar3123.staffchat.util.FormatUtils;
-import me.oskar3123.staffchat.util.StringUtils;
-
-public class BungeeFormatUtils {
-
-  private BungeeFormatUtils() {}
-
-  public static String replacePlaceholders(
-      String string,
-      Function<String, String> colorize,
-      Supplier<String> serverSupplier,
-      Supplier<String> nameSupplier,
-      String message) {
-    string =
-        string.replaceAll("\\{SERVER}", StringUtils.sanitize(colorize.apply(serverSupplier.get())));
-    return FormatUtils.replacePlaceholders(string, colorize, nameSupplier, message);
-  }
-}
diff --git a/src/main/java/me/oskar3123/staffchat/util/FormatUtils.java b/src/main/java/me/oskar3123/staffchat/util/FormatUtils.java
index 2629282..891734c 100644
--- a/src/main/java/me/oskar3123/staffchat/util/FormatUtils.java
+++ b/src/main/java/me/oskar3123/staffchat/util/FormatUtils.java
@@ -7,6 +7,17 @@ public class FormatUtils {
 
   private FormatUtils() {}
 
+  public static String replacePlaceholders(
+      String string,
+      Function<String, String> colorize,
+      Supplier<String> serverSupplier,
+      Supplier<String> nameSupplier,
+      String message) {
+    string =
+        string.replaceAll("\\{SERVER}", StringUtils.sanitize(colorize.apply(serverSupplier.get())));
+    return replacePlaceholders(string, colorize, nameSupplier, message);
+  }
+
   public static String replacePlaceholders(
       String string,
       Function<String, String> colorize,
diff --git a/src/velocity/java/me/oskar3123/staffchat/velocity/handler/VelocityStaffChatHandler.java b/src/velocity/java/me/oskar3123/staffchat/velocity/handler/VelocityStaffChatHandler.java
index c425594..330bac3 100644
--- a/src/velocity/java/me/oskar3123/staffchat/velocity/handler/VelocityStaffChatHandler.java
+++ b/src/velocity/java/me/oskar3123/staffchat/velocity/handler/VelocityStaffChatHandler.java
@@ -61,7 +61,16 @@ public class VelocityStaffChatHandler {
 
   private void broadcastStaffMessage(Player player, String format, String message) {
     String formattedMessage =
-        FormatUtils.replacePlaceholders(format, Function.identity(), player::getUsername, message);
+        FormatUtils.replacePlaceholders(
+            format,
+            Function.identity(),
+            () ->
+                player
+                    .getCurrentServer()
+                    .map(connection -> connection.getServerInfo().getName())
+                    .orElse(""),
+            player::getUsername,
+            message);
 
     TextComponent component =
         LegacyComponentSerializer.legacyAmpersand().deserialize(formattedMessage);