diff --git a/CHANGELOG b/CHANGELOG
index 2e12889cb7..f110b16e1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 8.4.0 (unreleased)
   - Add link to merge request on build detail page.
 
 v 8.3.2 (unreleased)
+  - Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll (Stan Hu)
   - Enable "Add key" button when user fills in a proper key
 
 v 8.3.1
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9f688e3b45..a9bf4eb403 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -76,7 +76,9 @@ class Repository
       path: path,
       limit: limit,
       offset: offset,
-      follow: path.present?
+      # --follow doesn't play well with --skip. See:
+      # https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520
+      follow: false
     }
 
     commits = Gitlab::Git::Commit.where(options)