diff --git a/lib/WebGUI/Inbox.pm b/lib/WebGUI/Inbox.pm
index 08c4c1a43..7ddfa1561 100644
--- a/lib/WebGUI/Inbox.pm
+++ b/lib/WebGUI/Inbox.pm
@@ -111,8 +111,8 @@ sub getMessagesForUser {
 		if ($user->userId eq $userId || $user->isInGroup($groupId)) {
 			push(@messages, $self->getMessage($messageId));
 			$counter++;
+			last if ($counter >= $limit);
 		}
-		last if ($counter >= $limit);
 	}
 	$rs->finish;
 	return \@messages;