diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
index 1c2301d19..5393a5586 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -101,7 +101,9 @@ public class MessageController {
                                          @Valid                    IncomingMessageList messages)
       throws IOException, RateLimitExceededException
   {
-    rateLimiters.getMessagesLimiter().validate(source.getNumber() + "__" + destinationName);
+    if (!source.getNumber().equals(destinationName)) {
+      rateLimiters.getMessagesLimiter().validate(source.getNumber() + "__" + destinationName);
+    }
 
     try {
       boolean isSyncMessage = source.getNumber().equals(destinationName);