diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java index 6adc08963c3e..2f482b46aa6e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java @@ -497,8 +497,9 @@ protected void onPostExecute(CommentList comments) { } mPullToRefreshHelper.setRefreshing(false); - if (isCancelled()) + if (isCancelled()) { return; + } mCanLoadMoreComments = (comments != null && comments.size() > 0); @@ -513,7 +514,7 @@ protected void onPostExecute(CommentList comments) { return; } } - if (comments.size() > 0) { + if (!getActivity().isFinishing() && comments != null && comments.size() > 0) { getCommentAdapter().loadComments(); } }