diff --git a/app/javascript/mastodon/features/standalone/public_timeline/index.js b/app/javascript/mastodon/features/standalone/public_timeline/index.js index 5a67492ac0..10129e606f 100644 --- a/app/javascript/mastodon/features/standalone/public_timeline/index.js +++ b/app/javascript/mastodon/features/standalone/public_timeline/index.js @@ -60,9 +60,13 @@ class PublicTimeline extends React.PureComponent { } } - handleLoadMore = maxId => { - const { dispatch, local } = this.props; - dispatch(local ? expandCommunityTimeline({ maxId }) : expandPublicTimeline({ maxId })); + handleLoadMore = () => { + const { dispatch, statusIds, local } = this.props; + const maxId = statusIds.last(); + + if (maxId) { + dispatch(local ? expandCommunityTimeline({ maxId }) : expandPublicTimeline({ maxId })); + } } setRef = c => {