diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java
index 79f9c1f2..6ad698cb 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/AbstractSqlMessenger.java
@@ -82,7 +82,7 @@ public abstract class AbstractSqlMessenger implements Messenger {
 
     public void pollMessages() {
         try (Connection c = getConnection()) {
-            try (PreparedStatement ps = c.prepareStatement("SELECT `id`, `msg` FROM " + getTableName() + " WHERE `id` > ? AND (NOW() - `time` > 60)")) {
+            try (PreparedStatement ps = c.prepareStatement("SELECT `id`, `msg` FROM " + getTableName() + " WHERE `id` > ? AND (NOW() - `time` < 30)")) {
                 ps.setLong(1, this.lastId);
                 try (ResultSet rs = ps.executeQuery()) {
                     while (rs.next()) {
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java
index 892c9171..1327d4e8 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/sql/SqlMessenger.java
@@ -85,6 +85,6 @@ public class SqlMessenger extends AbstractSqlMessenger {
 
     @Override
     protected String getTableName() {
-        return this.sqlDao.getPrefix().apply("{prefix}_messages");
+        return this.sqlDao.getPrefix().apply("{prefix}messages");
     }
 }