diff --git a/src/plugins/ChannelArchiver.ts b/src/plugins/ChannelArchiver.ts
index a4bd2779..4704630b 100644
--- a/src/plugins/ChannelArchiver.ts
+++ b/src/plugins/ChannelArchiver.ts
@@ -99,6 +99,7 @@ export class ChannelArchiverPlugin extends ZeppelinPlugin {
     while (archivedMessages < maxMessagesToArchive) {
       const messagesToFetch = Math.min(MAX_MESSAGES_PER_FETCH, maxMessagesToArchive - archivedMessages);
       const messages = await args.channel.getMessages(messagesToFetch, previousId);
+      if (messages.length === 0) break;
 
       for (const message of messages) {
         const ts = moment.utc(message.timestamp).format("YYYY-MM-DD HH:mm:ss");