diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89a4a3376..e877d8506 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Fix sluggish Back button when navigation back to channels with lots of comments _community pr!_ ([#4576](https://github.com/lbryio/lbry-desktop/pull/4576))
+- Fix 'Related' and 'Comments' section lazy-load not working in some scenarios _community pr!_ ([#4586](https://github.com/lbryio/lbry-desktop/pull/4586))
 
 ## [0.47.1] - [2020-07-23]
 
diff --git a/ui/page/file/view.jsx b/ui/page/file/view.jsx
index c947f58c7..2de8cd13e 100644
--- a/ui/page/file/view.jsx
+++ b/ui/page/file/view.jsx
@@ -36,6 +36,11 @@ type Props = {
 };
 
 class FilePage extends React.Component<Props> {
+  constructor() {
+    super();
+    this.lastReset = undefined;
+  }
+
   componentDidMount() {
     const { uri, fetchFileInfo, fetchCostInfo, setViewed, isSubscribed } = this.props;
 
@@ -63,6 +68,7 @@ class FilePage extends React.Component<Props> {
 
     if (prevProps.uri !== uri) {
       setViewed(uri);
+      this.lastReset = Date.now();
     }
 
     // @if TARGET='app'
@@ -136,6 +142,8 @@ class FilePage extends React.Component<Props> {
     );
   }
 
+  lastReset: ?any;
+
   render() {
     const { uri, renderMode, costInfo, obscureNsfw, isMature } = this.props;
 
@@ -158,7 +166,7 @@ class FilePage extends React.Component<Props> {
               actions={
                 <div>
                   <CommentCreate uri={uri} />
-                  <WaitUntilOnPage>
+                  <WaitUntilOnPage lastUpdateDate={this.lastReset}>
                     <CommentsList uri={uri} />
                   </WaitUntilOnPage>
                 </div>