diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs
index e2ea4c87e..8b61e89e3 100644
--- a/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs
+++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs
@@ -36,7 +36,7 @@ namespace Discord.WebSocket
                     return result;
 
                 //Download remaining messages
-                ulong? minId = cachedMessages.Count > 0 ? cachedMessages.Min(x => x.Id) : (ulong?)null;
+                ulong? minId = cachedMessages.Count > 0 ? cachedMessages.Min(x => x.Id) : fromMessageId;
                 var downloadedMessages = ChannelHelper.GetMessagesAsync(channel, discord, minId, dir, limit, guild, options);
                 return result.Concat(downloadedMessages);
             }