diff --git a/packages/netlify-cms-core/src/components/Collection/Entries/EntryListing.js b/packages/netlify-cms-core/src/components/Collection/Entries/EntryListing.js
index 781ca3bb..411f2938 100644
--- a/packages/netlify-cms-core/src/components/Collection/Entries/EntryListing.js
+++ b/packages/netlify-cms-core/src/components/Collection/Entries/EntryListing.js
@@ -25,10 +25,13 @@ export default class EntryListing extends React.Component {
     handleCursorActions: PropTypes.func.isRequired,
   };
 
+  hasMore = () => {
+    return Cursor.create(this.props.cursor).actions.has('append_next');
+  };
+
   handleLoadMore = () => {
-    const { cursor, handleCursorActions } = this.props;
-    if (Cursor.create(cursor).actions.has('append_next')) {
-      handleCursorActions('append_next');
+    if (this.hasMore()) {
+      this.props.handleCursorActions('append_next');
     }
   };
 
@@ -71,7 +74,7 @@ export default class EntryListing extends React.Component {
           {Map.isMap(collections)
             ? this.renderCardsForSingleCollection()
             : this.renderCardsForMultipleCollections()}
-          <Waypoint onEnter={this.handleLoadMore} />
+          {this.hasMore() && <Waypoint onEnter={this.handleLoadMore} />}
         </CardsGrid>
       </div>
     );