diff --git a/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs b/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs
index ed9e5a7d7..f59019440 100644
--- a/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs
+++ b/src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs
@@ -43,13 +43,13 @@ namespace Discord
 
             public async Task<bool> MoveNext(CancellationToken cancelToken)
             {
-                if (_info.Remaining == 0)
-                    return false;
-
                 if (_currentPage == null || _currentPageEnumerator == null || !_currentPageEnumerator.MoveNext())
                 {
                     _currentPageEnumerator?.Dispose();
 
+                    if (_info.Remaining == 0)
+                        return false;
+
                     var data = await _source._getPage(_info, cancelToken).ConfigureAwait(false);
                     _currentPage = new Page<T>(_info, data);
                     _currentPageEnumerator = _currentPage.GetEnumerator();
@@ -75,7 +75,7 @@ namespace Discord
                             _info.Remaining = 0;
                     }
 
-                    _currentPageEnumerator.MoveNext();
+                    return _currentPageEnumerator.MoveNext();
                 }
 
                 return true;