diff --git a/src/newsreader/js/pages/homepage/components/postlist/PostItem.js b/src/newsreader/js/pages/homepage/components/postlist/PostItem.js
index 205c3b5..ffb6832 100644
--- a/src/newsreader/js/pages/homepage/components/postlist/PostItem.js
+++ b/src/newsreader/js/pages/homepage/components/postlist/PostItem.js
@@ -34,9 +34,6 @@ class PostItem extends React.Component {
       ruleUrl = `${this.props.feedUrl}/${rule.id}/`;
     }
 
-    {
-      /* TODO: figure out why this is called up to three times */
-    }
     return (
       <li className="posts__item" ref={this.props.forwardedRef}>
         <h5
diff --git a/src/newsreader/js/pages/homepage/components/postlist/PostList.js b/src/newsreader/js/pages/homepage/components/postlist/PostList.js
index 89ef257..168ca8e 100644
--- a/src/newsreader/js/pages/homepage/components/postlist/PostList.js
+++ b/src/newsreader/js/pages/homepage/components/postlist/PostList.js
@@ -24,7 +24,7 @@ class PostList extends React.Component {
   }
 
   componentDidUpdate() {
-    if (this.lastPostRef.current) {
+    if (this.lastPostRef.current && !this.props.isFetching) {
       this.observer.observe(this.lastPostRef.current);
     }
   }