diff --git a/src/main/java/net/dv8tion/jda/internal/handle/MessageCreateHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/MessageCreateHandler.java
index 3f233749bf..24fa5ba047 100644
--- a/src/main/java/net/dv8tion/jda/internal/handle/MessageCreateHandler.java
+++ b/src/main/java/net/dv8tion/jda/internal/handle/MessageCreateHandler.java
@@ -99,7 +99,7 @@ protected Long handleInternally(DataObject content)
 
                 //Discord will only ever allow this property to show up to 50,
                 // so we don't want to update it to be over 50 because we don't want users to use it incorrectly.
-                int newMessageCount = Math.max(gThread.getMessageCount() + 1, 50);
+                int newMessageCount = Math.min(gThread.getMessageCount() + 1, 50);
                 gThread.setMessageCount(newMessageCount);
             }
         }