diff --git a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
index 19a3939bc..b49b24c07 100644
--- a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
+++ b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
@@ -464,7 +464,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         // Max PPS Checker
         if (conf.getMaxPPS() > 0) {
             if (info.getPacketsPerSecond() >= conf.getMaxPPS()) {
-                info.disconnect(conf.getMaxPPSKickMessage());
+                info.disconnect(conf.getMaxPPSKickMessage().replace("%pps", ((Long) info.getPacketsPerSecond()).intValue() + ""));
                 return true; // don't send current packet
             }
         }
@@ -482,7 +482,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                 }
 
                 if (info.getWarnings() >= conf.getMaxWarnings()) {
-                    info.disconnect(conf.getMaxWarningsKickMessage());
+                    info.disconnect(conf.getMaxWarningsKickMessage().replace("%pps", ((Long) info.getPacketsPerSecond()).intValue() + ""));
                     return true; // don't send current packet
                 }
             }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index d8b59ed64..44ac2107c 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -20,9 +20,9 @@ send-supported-versions: false
 # Anti-Cheat, Packets Per Second (PPS) limiter
 # Clients by default send around 20-90 packets per second.
 
-# What is the maximum per second a client can send
+# What is the maximum per second a client can send (Use %pps to display their pps)
 # Use -1 to disable.
-max-pps: 400
+max-pps: 600
 max-pps-kick-msg: "You are sending too many packets!"
 
 # We can also kick them if over a period they send over a threshold a certain amount of times.